OpenBIOS December 2008

openbios@openbios.org

8 participants
78 discussions

r283 - openbios-devel/arch/sparc64
by svn＠openbios.org 11 Dec '08

11 Dec '08

Author: blueswirl Date: 2008-12-11 18:10:03 +0100 (Thu, 11 Dec 2008) New Revision: 283 Modified: openbios-devel/arch/sparc64/openbios.c Log: Fix fake CPU ID value (Igor Kovalenko) Small correction: cpuid property of qemu cpu should be "0" for the linux kernel to boot on qemu. This is because kernel is reading cpu registers to find out current smp processor ID and it happens to find out "0" cpuid because corresponding register is zeroed by qemu. Currently kernel fails since there is no "0" cpu node in tree. Modified: openbios-devel/arch/sparc64/openbios.c =================================================================== --- openbios-devel/arch/sparc64/openbios.c 2008-12-05 18:32:39 UTC (rev 282) +++ openbios-devel/arch/sparc64/openbios.c 2008-12-11 17:10:03 UTC (rev 283) @@ -424,7 +424,7 @@ push_str("sparc-version"); fword("property"); - PUSH(1); + PUSH(0); fword("encode-int"); push_str("cpuid"); fword("property");

1 0

r282 - in openbios-devel: drivers modules
by svn＠openbios.org 05 Dec '08

05 Dec '08

Author: blueswirl Date: 2008-12-05 19:32:39 +0100 (Fri, 05 Dec 2008) New Revision: 282 Modified: openbios-devel/drivers/build.xml openbios-devel/drivers/pci.c openbios-devel/modules/video.c Log: Misc VGA fixes (Laurent Vivier) Modified: openbios-devel/drivers/build.xml =================================================================== --- openbios-devel/drivers/build.xml 2008-12-05 18:31:27 UTC (rev 281) +++ openbios-devel/drivers/build.xml 2008-12-05 18:32:39 UTC (rev 282) @@ -14,6 +14,7 @@ <object source="obio.c" condition="DRIVER_OBIO"/> <object source="vga_load_regs.c" condition="DRIVER_VGA"/> <object source="vga_set_mode.c" condition="DRIVER_VGA"/> + <object source="vga_vbe.c" condition="DRIVER_VGA"/> </library> <dictionary name="openbios" target="forth"> Modified: openbios-devel/drivers/pci.c =================================================================== --- openbios-devel/drivers/pci.c 2008-12-05 18:31:27 UTC (rev 281) +++ openbios-devel/drivers/pci.c 2008-12-05 18:32:39 UTC (rev 282) @@ -305,11 +305,9 @@ static int vga_config_cb (const pci_config_t *config) { -#if 0 if (config->regions[0] != 0x00000000) vga_vbe_init(config->path, config->regions[0], config->sizes[0], config->regions[1], config->sizes[1]); -#endif return 0; } Modified: openbios-devel/modules/video.c =================================================================== --- openbios-devel/modules/video.c 2008-12-05 18:31:27 UTC (rev 281) +++ openbios-devel/modules/video.c 2008-12-05 18:32:39 UTC (rev 282) @@ -148,7 +148,7 @@ while( ww-- ) *p++ = col; } else { - char *p = (char*)pp + x; + char *p = (ushort*)pp + x; while( ww-- ) *p++ = col; } @@ -181,6 +181,10 @@ dac[1] = ((color >> 8) & 0xff) << 24; // Green dac[1] = (color & 0xff) << 24; // Blue } +#else + vga_set_color(ind, ((color >> 16) & 0xff), + ((color >> 8) & 0xff), + (color & 0xff)); #endif } @@ -278,14 +282,7 @@ PUSH(len); } -static void -video_open(void) -{ - RET(-1); -} - NODE_METHODS( video ) = { - {"open", video_open }, {"dimensions", video_dimensions }, {"set-colors", video_set_colors }, {"fill-rectangle", video_fill_rect },

1 0

r281 - in openbios-devel: arch/ppc/qemu arch/sparc32 arch/x86 arch/x86/xbox include/openbios modules
by svn＠openbios.org 05 Dec '08

05 Dec '08

Author: blueswirl Date: 2008-12-05 19:31:27 +0100 (Fri, 05 Dec 2008) New Revision: 281 Modified: openbios-devel/arch/ppc/qemu/console.c openbios-devel/arch/sparc32/console.c openbios-devel/arch/sparc32/openbios.c openbios-devel/arch/sparc32/openbios.h openbios-devel/arch/x86/openbios.c openbios-devel/arch/x86/xbox/console.c openbios-devel/include/openbios/drivers.h openbios-devel/modules/console.c openbios-devel/modules/video.c Log: Initialize VGA from PCI configuration (Laurent Vivier) Modified: openbios-devel/arch/ppc/qemu/console.c =================================================================== --- openbios-devel/arch/ppc/qemu/console.c 2008-12-04 20:14:23 UTC (rev 280) +++ openbios-devel/arch/ppc/qemu/console.c 2008-12-05 18:31:27 UTC (rev 281) @@ -138,20 +138,6 @@ #include "../../../modules/video.c" #include "../../../modules/console.c" -static uint32_t vga_phys_mem; -static int vga_width, vga_height, vga_depth; - -int Qemu_GetFBInfo( osi_fb_info_t *fb ) -{ - fb->mphys = vga_phys_mem; - fb->w = vga_width; - fb->h = vga_height; - fb->depth = vga_depth; - fb->rb = fb->w * ((fb->depth + 7) / 8); - - return 0; -} - /* ****************************************************************** * common functions, implementing simple concurrent console * ****************************************************************** */ Modified: openbios-devel/arch/sparc32/console.c =================================================================== --- openbios-devel/arch/sparc32/console.c 2008-12-04 20:14:23 UTC (rev 280) +++ openbios-devel/arch/sparc32/console.c 2008-12-05 18:31:27 UTC (rev 281) @@ -141,7 +141,7 @@ #define DAC_BASE 0x00200000ULL #define DAC_SIZE 16 -static unsigned char *vmem; +unsigned char *vmem; static volatile uint32_t *dac; typedef struct osi_fb_info { @@ -149,19 +149,6 @@ int rb, w, h, depth; } osi_fb_info_t; -static int TCX_GetFBInfo( osi_fb_info_t *fb ) -{ - fb->w = 1024; - fb->h = 768; - fb->depth = 8; - fb->rb = 1024; - fb->mphys = (unsigned long)vmem; - - return 0; -} - -#define openbios_GetFBInfo(x) TCX_GetFBInfo(x) - #include "../../modules/video.c" #include "../../modules/console.c" Modified: openbios-devel/arch/sparc32/openbios.c =================================================================== --- openbios-devel/arch/sparc32/openbios.c 2008-12-04 20:14:23 UTC (rev 280) +++ openbios-devel/arch/sparc32/openbios.c 2008-12-05 18:31:27 UTC (rev 281) @@ -122,7 +122,7 @@ #endif #ifdef CONFIG_DRIVER_SBUS #ifdef CONFIG_DEBUG_CONSOLE_VIDEO - init_video(); + init_video((unsigned long)vmem, 1024, 768, 8, 1024); #endif ob_sbus_init(hwdef->iommu_base + 0x1000ULL, qemu_machine_type); #endif Modified: openbios-devel/arch/sparc32/openbios.h =================================================================== --- openbios-devel/arch/sparc32/openbios.h 2008-12-04 20:14:23 UTC (rev 280) +++ openbios-devel/arch/sparc32/openbios.h 2008-12-05 18:31:27 UTC (rev 281) @@ -20,6 +20,7 @@ int openbios(void); /* console.c */ +extern unsigned char *vmem; extern void cls(void); #ifdef CONFIG_DEBUG_CONSOLE extern int uart_init(uint64_t port, unsigned long speed); Modified: openbios-devel/arch/x86/openbios.c =================================================================== --- openbios-devel/arch/x86/openbios.c 2008-12-04 20:14:23 UTC (rev 280) +++ openbios-devel/arch/x86/openbios.c 2008-12-05 18:31:27 UTC (rev 281) @@ -51,7 +51,7 @@ ob_floppy_init(); #endif #ifdef CONFIG_XBOX - init_video(); + init_video(phys_to_virt(0x3C00000), 640, 480, 32, 2560); node_methods_init(); #endif device_end(); Modified: openbios-devel/arch/x86/xbox/console.c =================================================================== --- openbios-devel/arch/x86/xbox/console.c 2008-12-04 20:14:23 UTC (rev 280) +++ openbios-devel/arch/x86/xbox/console.c 2008-12-05 18:31:27 UTC (rev 281) @@ -19,19 +19,6 @@ int rb, w, h, depth; } osi_fb_info_t; -int Xbox_GetFBInfo (osi_fb_info_t *fb) -{ - fb->w = 640; - fb->h = 480; - fb->depth = 32; - fb->rb = fb->w * 4; /* rgb + alpha */ - fb->mphys = phys_to_virt(0x3C00000); /* 60M - 64M */ - - return 0; -} - -#define openbios_GetFBInfo(x) Xbox_GetFBInfo(x) - #include "../../../modules/video.c" #include "../../../modules/console.c" Modified: openbios-devel/include/openbios/drivers.h =================================================================== --- openbios-devel/include/openbios/drivers.h 2008-12-04 20:14:23 UTC (rev 280) +++ openbios-devel/include/openbios/drivers.h 2008-12-05 18:31:27 UTC (rev 281) @@ -22,7 +22,7 @@ int keyboard_dataready(void); unsigned char keyboard_readdata(void); #ifdef CONFIG_DEBUG_CONSOLE_VIDEO -void init_video(void); +void init_video(unsigned long fb, int width, int height, int depth, int rb); #endif #endif #ifdef CONFIG_DRIVER_IDE Modified: openbios-devel/modules/console.c =================================================================== --- openbios-devel/modules/console.c 2008-12-04 20:14:23 UTC (rev 280) +++ openbios-devel/modules/console.c 2008-12-05 18:31:27 UTC (rev 281) @@ -150,24 +150,10 @@ static void scroll1( void ) { - osi_fb_info_t fb; - int i, x, offs, size, *dest, *src; - - openbios_GetFBInfo( &fb ); + int x; - offs = fb.rb * FONT_ADJ_HEIGHT; - size = (fb.h * fb.rb - offs)/16; - dest = (int*)fb.mphys; - src = (int*)(fb.mphys + offs); + video_scroll( FONT_ADJ_HEIGHT ); - for( i=0; i<size; i++ ) { - dest[0] = src[0]; - dest[1] = src[1]; - dest[2] = src[2]; - dest[3] = src[3]; - dest += 4; - src += 4; - } for( x=0; x<cons.w; x++ ) cons.buf[(cons.h-1)*cons.w + x] = 0; draw_line(cons.h-1); Modified: openbios-devel/modules/video.c =================================================================== --- openbios-devel/modules/video.c 2008-12-04 20:14:23 UTC (rev 280) +++ openbios-devel/modules/video.c 2008-12-05 18:31:27 UTC (rev 281) @@ -184,7 +184,26 @@ #endif } +void +video_scroll( int height ) +{ + int i, offs, size, *dest, *src; + offs = video.fb.rb * height; + size = (video.fb.h * video.fb.rb - offs)/16; + dest = (int*)video.fb.mphys; + src = (int*)(video.fb.mphys + offs); + + for( i=0; i<size; i++ ) { + dest[0] = src[0]; + dest[1] = src[1]; + dest[2] = src[2]; + dest[3] = src[3]; + dest += 4; + src += 4; + } +} + /************************************************************************/ /* OF methods */ /************************************************************************/ @@ -280,15 +299,16 @@ /************************************************************************/ void -init_video( void ) +init_video( unsigned long fb, int width, int height, int depth, int rb ) { int i, s, size; phandle_t ph=0; - - if( openbios_GetFBInfo(&video.fb) ) { - printk("init_video: No video display\n"); - return; - } + + video.fb.mphys = fb; + video.fb.w = width; + video.fb.h = height; + video.fb.depth = depth; + video.fb.rb = rb; while( (ph=dt_iterate_type(ph, "display")) ) { set_property( ph, "width", (char*)&video.fb.w, 4 ); set_property( ph, "height", (char*)&video.fb.h, 4 ); @@ -308,7 +328,7 @@ ofmem_claim_virt( video.fb.mphys, size, 0 ); ofmem_map( video.fb.mphys, video.fb.mphys, size, -1 ); #endif - + for( i=0; i<256; i++ ) set_color( i, i * 0x010101 );

1 0

r280 - openbios-devel/config/examples
by svn＠openbios.org 04 Dec '08

04 Dec '08

Author: blueswirl Date: 2008-12-04 21:14:23 +0100 (Thu, 04 Dec 2008) New Revision: 280 Modified: openbios-devel/config/examples/amd64_rules.xml openbios-devel/config/examples/cross-ppc_rules.xml openbios-devel/config/examples/cross-sparc32_rules.xml openbios-devel/config/examples/cross-sparc64_rules.xml openbios-devel/config/examples/sparc32_rules.xml openbios-devel/config/examples/sparc64_rules.xml openbios-devel/config/examples/x86_rules.xml Log: Evaluate date using C locale and UTC timezone, original patch by Laurent Vivier Modified: openbios-devel/config/examples/amd64_rules.xml =================================================================== --- openbios-devel/config/examples/amd64_rules.xml 2008-12-01 19:08:33 UTC (rev 279) +++ openbios-devel/config/examples/amd64_rules.xml 2008-12-04 20:14:23 UTC (rev 280) @@ -34,7 +34,7 @@ $(ODIR)/forth/version.fs: @test -d $(dir $@) || $(INSTALL) -d $(dir $@) - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ echo ": version \" $(VERSION)\" ; " ; ) \ > $(dir $(a))/version.fs Modified: openbios-devel/config/examples/cross-ppc_rules.xml =================================================================== --- openbios-devel/config/examples/cross-ppc_rules.xml 2008-12-01 19:08:33 UTC (rev 279) +++ openbios-devel/config/examples/cross-ppc_rules.xml 2008-12-04 20:14:23 UTC (rev 280) @@ -40,13 +40,13 @@ versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs $(ODIR)/forth/version.fs: - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ echo ": version \" $(VERSION)\" ; " ; ) \ > $(dir $(a))/version.fs $(ODIR)/target/include/openbios-version.h: - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \ echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; \ echo "#define OPENBIOS_RELEASE \"$(VERSION)\"" ; ) \ Modified: openbios-devel/config/examples/cross-sparc32_rules.xml =================================================================== --- openbios-devel/config/examples/cross-sparc32_rules.xml 2008-12-01 19:08:33 UTC (rev 279) +++ openbios-devel/config/examples/cross-sparc32_rules.xml 2008-12-04 20:14:23 UTC (rev 280) @@ -38,13 +38,13 @@ versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs $(ODIR)/forth/version.fs: - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ echo ": version \" $(VERSION)\" ; " ; ) \ > $(dir $(a))/version.fs $(ODIR)/target/include/openbios-version.h: - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \ echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; \ echo "#define OPENBIOS_RELEASE \"$(VERSION)\"" ; ) \ Modified: openbios-devel/config/examples/cross-sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/cross-sparc64_rules.xml 2008-12-01 19:08:33 UTC (rev 279) +++ openbios-devel/config/examples/cross-sparc64_rules.xml 2008-12-04 20:14:23 UTC (rev 280) @@ -39,13 +39,13 @@ versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs $(ODIR)/forth/version.fs: - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ echo ": version \" $(VERSION)\" ; " ; ) \ > $(dir $(a))/version.fs $(ODIR)/target/include/openbios-version.h: - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \ echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; \ echo "#define OPENBIOS_RELEASE \"$(VERSION)\"" ; ) \ Modified: openbios-devel/config/examples/sparc32_rules.xml =================================================================== --- openbios-devel/config/examples/sparc32_rules.xml 2008-12-01 19:08:33 UTC (rev 279) +++ openbios-devel/config/examples/sparc32_rules.xml 2008-12-04 20:14:23 UTC (rev 280) @@ -43,13 +43,13 @@ versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs $(ODIR)/forth/version.fs: - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ echo ": version \" $(VERSION)\" ; " ; ) \ > $(dir $(a))/version.fs $(ODIR)/target/include/openbios-version.h: - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \ echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; \ echo "#define OPENBIOS_RELEASE \"$(VERSION)\"" ; ) \ Modified: openbios-devel/config/examples/sparc64_rules.xml =================================================================== --- openbios-devel/config/examples/sparc64_rules.xml 2008-12-01 19:08:33 UTC (rev 279) +++ openbios-devel/config/examples/sparc64_rules.xml 2008-12-04 20:14:23 UTC (rev 280) @@ -50,13 +50,13 @@ versions: $(ODIR)/target/include/openbios-version.h $(ODIR)/forth/version.fs $(ODIR)/forth/version.fs: - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ echo ": version \" $(VERSION)\" ; " ; ) \ > $(dir $(a))/version.fs $(ODIR)/target/include/openbios-version.h: - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo "#define OPENBIOS_BUILD_DATE \"$$DATE\"" ; \ echo "#define OPENBIOS_VERSION_STR \"$(VERSION)\"" ; \ echo "#define OPENBIOS_RELEASE \"$(VERSION)\"" ; ) \ Modified: openbios-devel/config/examples/x86_rules.xml =================================================================== --- openbios-devel/config/examples/x86_rules.xml 2008-12-01 19:08:33 UTC (rev 279) +++ openbios-devel/config/examples/x86_rules.xml 2008-12-04 20:14:23 UTC (rev 280) @@ -38,7 +38,7 @@ $(ODIR)/forth/version.fs: @test -d $(dir $@) || $(INSTALL) -d $(dir $@) - @DATE="$(shell echo `date +'%b %e %Y %H:%M'`)" ; \ + @DATE="$(shell echo `LC_ALL=C TZ=UTC date +'%b %e %Y %H:%M'`)" ; \ ( echo ": builddate \" $$DATE\" ; " ; \ echo ": version \" $(VERSION)\" ; " ; ) \ > $(dir $(a))/version.fs

1 0

Re: [OpenBIOS] [PATCH] Evaluate date using C locale
by laurent＠lvivier.info 04 Dec '08

04 Dec '08

>> This patch uses C locale to compute date for version.fs and >> openbios-version.h instead of current locale. > >You should use LC_ALL=C, not LANG=C; LANG provides a default for >all the separate locale settings that aren't otherwise set, while >LC_ALL overrides everything. Yes, you're right, but in fact LC_TIME should be enough. Laurent

3 2

[PATCH] Evaluate date using C locale
by Laurent Vivier 04 Dec '08

04 Dec '08

This patch uses C locale to compute date for version.fs and openbios- version.h instead of current locale. This avoids to have some dates like "déc 3 2008" instead of "dec 3 2008" Laurent -------------------- laurent(a)lvivier.info -------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

2 1

r279 - openbios-devel/forth/admin
by svn＠openbios.org 01 Dec '08

01 Dec '08

Author: blueswirl Date: 2008-12-01 20:08:33 +0100 (Mon, 01 Dec 2008) New Revision: 279 Modified: openbios-devel/forth/admin/nvram.fs Log: Fix NetBSD 4.0 booting Modified: openbios-devel/forth/admin/nvram.fs =================================================================== --- openbios-devel/forth/admin/nvram.fs 2008-12-01 18:04:16 UTC (rev 278) +++ openbios-devel/forth/admin/nvram.fs 2008-12-01 19:08:33 UTC (rev 279) @@ -305,8 +305,8 @@ " boot" " boot-command" str-config \ 7.4.3.5 " " " boot-file" str-config \ 7.4.3.5 " false" " diag-switch?" bool-config \ 7.4.3.5 -" net" " diag-device" str-config \ 7.4.3.5 -" diag" " diag-file" str-config \ 7.4.3.5 +no-conf-def " diag-device" str-config \ 7.4.3.5 +no-conf-def " diag-file" str-config \ 7.4.3.5 " false" " fcode-debug?" bool-config \ 7.7 " " " nvramrc" str-config \ 7.4.4.2 " false" " oem-banner?" bool-config

1 0

r278 - openbios-devel/arch/sparc32
by svn＠openbios.org 01 Dec '08

01 Dec '08

Author: blueswirl Date: 2008-12-01 19:04:16 +0100 (Mon, 01 Dec 2008) New Revision: 278 Modified: openbios-devel/arch/sparc32/aoutload.c openbios-devel/arch/sparc32/boot.c openbios-devel/arch/sparc32/boot.h openbios-devel/arch/sparc32/romvec.c Log: Fix NetBSD booting Modified: openbios-devel/arch/sparc32/aoutload.c =================================================================== --- openbios-devel/arch/sparc32/aoutload.c 2008-11-30 13:44:38 UTC (rev 277) +++ openbios-devel/arch/sparc32/aoutload.c 2008-12-01 18:04:16 UTC (rev 278) @@ -57,22 +57,19 @@ int image_retval; struct exec ehdr; unsigned long start, size; - unsigned int offset; + unsigned int offset = 512; image_name = image_version = NULL; if (!file_open(filename)) goto out; - for (offset = 0; offset < 16 * 512; offset += 512) { - file_seek(offset); - if (lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) { - debug("Can't read a.out header\n"); - retval = LOADER_NOT_SUPPORT; - goto out; - } - if (!N_BADMAG(ehdr)) - break; + file_seek(offset); + + if (lfile_read(&ehdr, sizeof ehdr) != sizeof ehdr) { + debug("Can't read a.out header\n"); + retval = LOADER_NOT_SUPPORT; + goto out; } if (N_BADMAG(ehdr)) { Modified: openbios-devel/arch/sparc32/boot.c =================================================================== --- openbios-devel/arch/sparc32/boot.c 2008-11-30 13:44:38 UTC (rev 277) +++ openbios-devel/arch/sparc32/boot.c 2008-12-01 18:04:16 UTC (rev 278) @@ -20,6 +20,18 @@ uint32_t cmdline_size; char boot_device; +static void try_path(const char *path, char *param, const void *romvec) +{ + push_str(path); + fword("pathres-resolve-aliases"); + bootpath = pop_fstr_copy(); + printk("Trying %s (%s)\n", path, bootpath); + + elf_load(&sys_info, path, param, romvec); + linux_load(&sys_info, path, param); + aout_load(&sys_info, path, romvec); +} + void boot(void) { char *path = pop_fstr_copy(), *param, *oldpath = path; @@ -87,7 +99,7 @@ obp_arg.argv[1] = param; } - romvec = init_openprom(qemu_mem_size, path); + romvec = init_openprom(qemu_mem_size); if (kernel_size) { int (*entry)(const void *romvec_ptr, int p2, int p3, int p4, int p5); @@ -103,20 +115,17 @@ else printk("without parameters.\n"); - if (elf_load(&sys_info, path, param, romvec) == LOADER_NOT_SUPPORT) - if (linux_load(&sys_info, path, param) == LOADER_NOT_SUPPORT) - if (aout_load(&sys_info, path, romvec) == LOADER_NOT_SUPPORT) { + try_path(path, param, romvec); - snprintf(altpath, sizeof(altpath), "%s:d", path); + push_str(path); + PUSH(':'); + fword("left-split"); + snprintf(altpath, sizeof(altpath), "%s:d", pop_fstr_copy()); + POP(); + POP(); - if (elf_load(&sys_info, altpath, param, romvec) - == LOADER_NOT_SUPPORT) - if (linux_load(&sys_info, altpath, param) - == LOADER_NOT_SUPPORT) - if (aout_load(&sys_info, altpath, romvec) - == LOADER_NOT_SUPPORT) - printk("Unsupported image format\n"); - } + try_path(altpath, param, romvec); + printk("Unsupported image format\n"); free(path); } Modified: openbios-devel/arch/sparc32/boot.h =================================================================== --- openbios-devel/arch/sparc32/boot.h 2008-11-30 13:44:38 UTC (rev 277) +++ openbios-devel/arch/sparc32/boot.h 2008-12-01 18:04:16 UTC (rev 278) @@ -24,10 +24,11 @@ unsigned int start_elf(unsigned long entry_point, unsigned long param); // romvec.c -void *init_openprom(unsigned long memsize, const char *path); +void *init_openprom(unsigned long memsize); // boot.c extern struct sys_info sys_info; +extern const char *bootpath; void boot(void); // sys_info.c Modified: openbios-devel/arch/sparc32/romvec.c =================================================================== --- openbios-devel/arch/sparc32/romvec.c 2008-11-30 13:44:38 UTC (rev 277) +++ openbios-devel/arch/sparc32/romvec.c 2008-12-01 18:04:16 UTC (rev 278) @@ -49,7 +49,7 @@ static int obp_devseek(int dev_desc, int hi, int lo); struct linux_arguments_v0 obp_arg; -static const char *bootpath; +const char *bootpath; static const struct linux_arguments_v0 * const obp_argp = &obp_arg; static void (*sync_hook)(void); @@ -501,7 +501,7 @@ } void * -init_openprom(unsigned long memsize, const char *path) +init_openprom(unsigned long memsize) { ptphys = totphys; ptmap = totmap; @@ -559,9 +559,6 @@ romvec0.pv_v2devops.v2_dev_write = obp_devwrite; romvec0.pv_v2devops.v2_dev_seek = obp_devseek; - push_str(path); - fword("pathres-resolve-aliases"); - bootpath = pop_fstr_copy(); romvec0.pv_v2bootargs.bootpath = &bootpath; romvec0.pv_v2bootargs.bootargs = &obp_arg.argv[1];

1 0