OpenBIOS September 2009

openbios@openbios.org

5 participants
19 discussions

starting
by G 3 18 Oct '10

18 Oct '10

I have begun doing work with OpenBIOS. I was wondering if it is possible to compile OpenBIOS for PowerPC on Mac OS X? If not, what Linux distro should I use? Any advice would really help.

6 17

QEMU OpenBIOS booting?
by Steven Noonan 24 May '10

24 May '10

Hi folks, I've been trying to use OpenBIOS with QEMU, and I've had trouble getting it to boot any PowerPC-based OS discs (Linux, Mac OS X, etc). OpenBIOS just doesn't seem to find anything bootable. If I try booting QEMU with -nographic, I get this output (I get the same with a self-built openbios-qemu.elf from the OpenBIOS SVN as well): ---- snip ---- >> ============================================================= >> OpenBIOS 1.0 [Apr 12 2009 00:55] >> Configuration device id QEMU version 1 machine id 1 >> CPUs: 1 >> Memory: 128M >> UUID: 00000000-0000-0000-0000-000000000000 >> CPU type PowerPC,970FX Welcome to OpenBIOS v1.0 built on Apr 12 2009 00:55 >> ELF - yaboot_startup: Entering boot, no path >> ELF - try_bootinfo: Trying hd:0,ppc\bootinfo.txt >> ELF - try_bootinfo: Can't open hd:0,ppc\bootinfo.txt >> ELF - try_path: Trying hd:2,\ofclient >> ELF - try_path: Can't open hd:2,\ofclient >> ELF - try_path: Trying hd:2,\yaboot conf=hd:2,\yaboot.conf >> ELF - try_path: Can't open hd:2,\yaboot >> *** Boot failure! No secondary bootloader specified *** ---- snip ---- Laurent Vivier suggested in this conversation in February (http://lists.openbios.org/pipermail/openbios/2009-February/003476.html) that there could be a bug in partition map decoding. Has such a bug been confirmed? I was trying to find the bug myself (I am an experienced C/C++ programmer), but the bug seems to be subtle, and my lack of familiarity with the code base doesn't help much. I've been trying to figure this out for 7 hours straight now... Any advice or other help would be much appreciated! - Steven

13 55

r589 - trunk/openbios-devel/arch/ppc/qemu
by svn＠openbios.org 22 Sep '09

22 Sep '09

Author: laurent Date: 2009-09-22 01:12:02 +0200 (Tue, 22 Sep 2009) New Revision: 589 Modified: trunk/openbios-devel/arch/ppc/qemu/main.c Log: ppc: simplify boot by using load and go. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/arch/ppc/qemu/main.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c 2009-09-21 23:00:42 UTC (rev 588) +++ trunk/openbios-devel/arch/ppc/qemu/main.c 2009-09-21 23:12:02 UTC (rev 589) @@ -39,81 +39,16 @@ #define NEWWORLD_DPRINTF(fmt, args...) SUBSYS_DPRINTF("NEWWORLD", fmt, ##args) static void -load(const char *path) +load(const char *path, const char *param) { char buffer[1024]; - sprintf(buffer, "load %s", path); + if (param) + sprintf(buffer, "load %s %s", path, param); + else + sprintf(buffer, "load %s", path); feval(buffer); } -static void -transfer_control_to_elf( ulong elf_entry ) -{ - ELF_DPRINTF("Starting ELF boot loader\n"); - call_elf( 0, 0, elf_entry ); - - fatal_error("call_elf returned unexpectedly\n"); -} - -static int -load_elf_rom( ulong *elf_entry, int fd ) -{ - int i, lszz_offs, elf_offs; - char *addr; - Elf_ehdr ehdr; - Elf_phdr *phdr; - size_t s; - - ELF_DPRINTF("Loading '%s' from '%s'\n", get_file_path(fd), - get_volume_name(fd) ); - - /* the ELF-image (usually) starts at offset 0x4000 */ - if( (elf_offs=find_elf(fd)) < 0 ) { - ELF_DPRINTF("----> %s is not an ELF image\n", get_file_path(fd)); - return -1; - } - if( !(phdr=elf_readhdrs(fd, elf_offs, &ehdr)) ) { - ELF_DPRINTF("elf_readhdrs failed\n"); - return -1; - } - - *elf_entry = ehdr.e_entry; - - /* load segments. Compressed ROM-image assumed to be located immediately - * after the last segment */ - lszz_offs = elf_offs; - for( i=0; i<ehdr.e_phnum; i++ ) { - /* p_memsz, p_flags */ - s = MIN( phdr[i].p_filesz, phdr[i].p_memsz ); - seek_io( fd, elf_offs + phdr[i].p_offset ); - - ELF_DPRINTF("filesz: %08lX memsz: %08lX p_offset: %08lX p_vaddr %08lX\n", - (ulong)phdr[i].p_filesz, (ulong)phdr[i].p_memsz, (ulong)phdr[i].p_offset, - (ulong)phdr[i].p_vaddr ); - - if( phdr[i].p_vaddr != phdr[i].p_paddr ) - ELF_DPRINTF("WARNING: ELF segment virtual addr != physical addr\n"); - lszz_offs = MAX( lszz_offs, elf_offs + phdr[i].p_offset + phdr[i].p_filesz ); - if( !s ) - continue; - if( ofmem_claim( phdr[i].p_vaddr, phdr[i].p_memsz, 0 ) == -1 ) - fatal_error("Claim failed!\n"); - - addr = (char*)phdr[i].p_vaddr; - if( read_io(fd, addr, s) != s ) { - ELF_DPRINTF("read failed\n"); - return -1; - } - - flush_icache_range( addr, addr+s ); - - ELF_DPRINTF("ELF ROM-section loaded at %08lX (size %08lX)\n", - (ulong)phdr[i].p_vaddr, (ulong)phdr[i].p_memsz ); - } - free( phdr ); - return lszz_offs; -} - static char * get_device( const char *path ) { @@ -206,60 +141,21 @@ /* qemu booting */ /************************************************************************/ static void -try_path(const char *path, const char *param) +try_path(const char *device, const char* filename, const char *param) { - ulong elf_entry; - int fd, ret; + char path[1024]; + if (filename) + snprintf(path, sizeof(path), "%s%s", device, filename); + else + snprintf(path, sizeof(path), "%s", device); + ELF_DPRINTF("Trying %s %s\n", path, param); - if ((fd = open_io(path)) == -1) { - ELF_DPRINTF("Can't open %s\n", path); - return; - } - ret = load_elf_rom( &elf_entry, fd ); - if (ret < 0) - return; - close_io( fd ); - encode_bootpath( path, param ); + load(path, param); update_nvram(); ELF_DPRINTF("Transfering control to %s %s\n", path, param); - transfer_control_to_elf( elf_entry ); - /* won't come here */ -} - -static void -try_chrp_script(const char *of_path, const char *param, const char *script_path) -{ - char path[1024]; - char *device, *filename, *directory; - int partition; - int size; - - device = get_device(of_path); - partition = get_partition(of_path); - filename = get_filename(of_path, &directory); - - CHRP_DPRINTF("device %s partition %d filename %s\n", device, partition, filename); - - /* read boot script */ - - if (partition == -1) - snprintf(path, sizeof(path), "%s:,%s", - device, script_path); - else - snprintf(path, sizeof(path), "%s:%d,%s", - device, partition, script_path); - - CHRP_DPRINTF("Trying %s\n", path); - load(path); - feval("load-size"); - size = POP(); - if (size == 0) { - ELF_DPRINTF("Can't open %s\n", of_path); - return; - } feval("go"); } @@ -340,8 +236,8 @@ POP(); param = pop_fstr_copy(); } - try_path(path, param); - try_chrp_script(path, param, chrp_path); + try_path(path, NULL, param); + try_path(path, chrp_path, param); } else { uint16_t boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); switch (boot_device) { @@ -353,12 +249,12 @@ path = strdup("cd:"); break; } - try_chrp_script(path, param, chrp_path); + try_path(path, chrp_path, param); } } else { NEWWORLD_DPRINTF("Entering boot, path %s\n", path); - try_path(path, param); - try_chrp_script(path, param, chrp_path); + try_path(path, NULL, param); + try_path(path, chrp_path, param); } printk("*** Boot failure! No secondary bootloader specified ***\n"); }

1 0

r588 - trunk/openbios-devel/modules
by svn＠openbios.org 22 Sep '09

22 Sep '09

Author: laurent Date: 2009-09-22 01:00:42 +0200 (Tue, 22 Sep 2009) New Revision: 588 Modified: trunk/openbios-devel/modules/mac-parts.c Log: mac-parts: better management of comma. from "PowerPC Microprocessor CHRP binding", "11.1.2. Open Method Algorithm": "If the argument string contains a comma, or if the argument string begins with a decimal digit, the partition component is deemed to be present." Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/modules/mac-parts.c =================================================================== --- trunk/openbios-devel/modules/mac-parts.c 2009-09-21 22:44:21 UTC (rev 587) +++ trunk/openbios-devel/modules/mac-parts.c 2009-09-21 23:00:42 UTC (rev 588) @@ -54,14 +54,20 @@ DPRINTF("partition %s\n", str); if( str ) { char *tmp; + char *comma = strchr(str, ','); parnum = atol(str); if( *str == 0 || *str == ',' ) parnum = -1; - tmp = str; - while (*tmp && *tmp != ',') - tmp++; - if (*tmp == ',') - tmp++; + if (comma) { + tmp = comma + 1; + } else { + if (*str >= '0' && *str <= '9') { + tmp = (char*)""; + } else { + tmp = str; + parnum = -1; + } + } if (strcmp(tmp, "%BOOT") == 0) want_bootcode = 1; free(str);

1 0

r587 - in trunk/openbios-devel: forth/debugging modules
by svn＠openbios.org 22 Sep '09

22 Sep '09

Author: laurent Date: 2009-09-22 00:44:21 +0200 (Tue, 22 Sep 2009) New Revision: 587 Modified: trunk/openbios-devel/forth/debugging/client.fs trunk/openbios-devel/modules/bootinfo-loader.c trunk/openbios-devel/modules/elf-loader.c trunk/openbios-devel/modules/xcoff-loader.c Log: Manage state-valid. "go" can be done only if init-program has set state-valid to true. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/forth/debugging/client.fs =================================================================== --- trunk/openbios-devel/forth/debugging/client.fs 2009-09-21 15:30:50 UTC (rev 586) +++ trunk/openbios-devel/forth/debugging/client.fs 2009-09-21 22:44:21 UTC (rev 587) @@ -17,6 +17,9 @@ \ 7.6.2 Program download and execute +variable state-valid +0 state-valid ! + variable file-size : !load-size file-size ! ; @@ -305,6 +308,7 @@ ; : go ( -- ) + state-valid @ not if exit then elf file-type @ = if [IFDEF] CONFIG_PPC elf-entry @ " (go)" evaluate @@ -332,10 +336,7 @@ then ; -: state-valid ( -- a-addr ) - ; - \ 7.6.3 Abort and resume \ already defined !? Modified: trunk/openbios-devel/modules/bootinfo-loader.c =================================================================== --- trunk/openbios-devel/modules/bootinfo-loader.c 2009-09-21 15:30:50 UTC (rev 586) +++ trunk/openbios-devel/modules/bootinfo-loader.c 2009-09-21 22:44:21 UTC (rev 587) @@ -124,6 +124,8 @@ char *tmp; char bootpath[1024]; + feval("0 state-valid !"); + chosen = find_dev("/chosen"); tmp = get_property(chosen, "bootpath", &proplen); memcpy(bootpath, tmp, proplen); @@ -179,9 +181,7 @@ DPRINTF("got bootscript %s\n", bootscript); - /* FIXME: should initialize saved-program-state. */ - push_str(bootscript); - feval("bootinfo-size ! bootinfo-entry !"); + feval("-1 state-valid !"); break; } else if (strcasecmp(tagbuf, "/chrp-boot") == 0) @@ -230,6 +230,9 @@ bootscript[scriptlen++] = c; } } + /* FIXME: should initialize saved-program-state. */ + push_str(bootscript); + feval("bootinfo-size ! bootinfo-entry !"); } NODE_METHODS( bootinfo_loader ) = { Modified: trunk/openbios-devel/modules/elf-loader.c =================================================================== --- trunk/openbios-devel/modules/elf-loader.c 2009-09-21 15:30:50 UTC (rev 586) +++ trunk/openbios-devel/modules/elf-loader.c 2009-09-21 22:44:21 UTC (rev 587) @@ -50,6 +50,8 @@ size_t size; char *addr; + feval("0 state-valid !"); + feval("load-base"); base = (char*)POP(); @@ -78,6 +80,7 @@ /* FIXME: should initialize saved-program-state. */ PUSH(ehdr->e_entry); feval("elf-entry !"); + feval("-1 state-valid !"); } NODE_METHODS( elf_loader ) = { Modified: trunk/openbios-devel/modules/xcoff-loader.c =================================================================== --- trunk/openbios-devel/modules/xcoff-loader.c 2009-09-21 15:30:50 UTC (rev 586) +++ trunk/openbios-devel/modules/xcoff-loader.c 2009-09-21 22:44:21 UTC (rev 587) @@ -47,6 +47,8 @@ uint32_t offset; int i; + feval("0 state-valid !"); + feval("load-base"); base = (char*)POP(); @@ -128,6 +130,8 @@ DPRINTF("XCOFF entry point: %x\n", *(uint32_t*)ahdr->entry); PUSH(*(uint32_t*)ahdr->entry); feval("xcoff-entry !"); + + feval("-1 state-valid !"); } NODE_METHODS( xcoff_loader ) = {

1 0

r586 - trunk/openbios-devel/modules
by svn＠openbios.org 21 Sep '09

21 Sep '09

Author: blueswirl Date: 2009-09-21 17:30:50 +0200 (Mon, 21 Sep 2009) New Revision: 586 Modified: trunk/openbios-devel/modules/bootinfo-loader.c Log: Fix accidental system header use in r584 Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/modules/bootinfo-loader.c =================================================================== --- trunk/openbios-devel/modules/bootinfo-loader.c 2009-09-20 20:18:15 UTC (rev 585) +++ trunk/openbios-devel/modules/bootinfo-loader.c 2009-09-21 15:30:50 UTC (rev 586) @@ -18,7 +18,7 @@ #include "openbios/bindings.h" #include "modules.h" #include "ofmem.h" -#include "stdio.h" +#include "libc/vsprintf.h" //#define DEBUG_BOOTINFO

1 0

Re: [OpenBIOS] r579 - trunk/openbios-devel/modules
by Segher Boessenkool 21 Sep '09

21 Sep '09

> +#ifdef CONFIG_PPC > + flush_icache_range( addr, addr + size ); > +#endif I'm not sure what your flush_icache_range() does exactly, but at a minimum it is misnamed: you need to flush the dcache for this range to memory (dcbst is enough), do a sync, invalidate the icache (icbi), do another sync, do an isync. Segher

3 4

r585 - trunk/openbios-devel/config/scripts
by svn＠openbios.org 20 Sep '09

20 Sep '09

Author: laurent Date: 2009-09-20 22:18:15 +0200 (Sun, 20 Sep 2009) New Revision: 585 Modified: trunk/openbios-devel/config/scripts/switch-arch Log: Revert commit of local change (sparc-elf / sparc-linux-gnu ) Modified: trunk/openbios-devel/config/scripts/switch-arch =================================================================== --- trunk/openbios-devel/config/scripts/switch-arch 2009-09-20 20:15:46 UTC (rev 584) +++ trunk/openbios-devel/config/scripts/switch-arch 2009-09-20 20:18:15 UTC (rev 585) @@ -122,7 +122,7 @@ ;; sparc32) - TARGET="sparc-linux-gnu-" + TARGET="sparc-elf-" CFLAGS="-Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc -fno-builtin" AS_FLAGS="-Wa,-xarch=v8 -Wa,-32" ;;

1 0

r584 - in trunk/openbios-devel: arch/ppc/qemu config/scripts forth/debugging modules
by svn＠openbios.org 20 Sep '09

20 Sep '09

Author: laurent Date: 2009-09-20 22:15:46 +0200 (Sun, 20 Sep 2009) New Revision: 584 Added: trunk/openbios-devel/modules/bootinfo-loader.c Modified: trunk/openbios-devel/arch/ppc/qemu/main.c trunk/openbios-devel/config/scripts/switch-arch trunk/openbios-devel/forth/debugging/client.fs trunk/openbios-devel/modules/build.xml trunk/openbios-devel/modules/init.c trunk/openbios-devel/modules/modules.h Log: Add bootinfo-loader. Signed-off-by: Laurent Vivier <Laurent(a)vivier.eu> Modified: trunk/openbios-devel/arch/ppc/qemu/main.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c 2009-09-20 19:32:30 UTC (rev 583) +++ trunk/openbios-devel/arch/ppc/qemu/main.c 2009-09-20 20:15:46 UTC (rev 584) @@ -229,27 +229,13 @@ /* won't come here */ } -/* - Parse SGML structure like: - <chrp-boot> - <description>Debian/GNU Linux Installation on IBM CHRP hardware</description> - <os-name>Debian/GNU Linux for PowerPC</os-name> - <boot-script>boot &device;:\install\yaboot</boot-script> - <icon size=64,64 color-space=3,3,2> - - CHRP system bindings are described at: - http://playground.sun.com/1275/bindings/chrp/chrp1_7a.ps -*/ static void try_chrp_script(const char *of_path, const char *param, const char *script_path) { - int tag, taglen, script, scriptlen, entity, chrp; - char tagbuf[128], path[1024], c; + char path[1024]; char *device, *filename, *directory; int partition; - int current, size; - char *base; - char *bootscript; + int size; device = get_device(of_path); partition = get_partition(of_path); @@ -274,98 +260,7 @@ ELF_DPRINTF("Can't open %s\n", of_path); return; } - bootscript = malloc(size); - if (bootscript == NULL) { - ELF_DPRINTF("Can't malloc %d bytes\n", size); - return; - } - feval("load-base"); - base = (char*)POP(); - - chrp = 0; - tag = 0; - taglen = 0; - script = 0; - scriptlen = 0; - entity = 0; - current = 0; - while (current < size) { - - c = base[current++]; - - if (c == '<') { - script = 0; - tag = 1; - taglen = 0; - } else if (c == '>') { - tag = 0; - tagbuf[taglen] = '\0'; - if (strcasecmp(tagbuf, "chrp-boot") == 0) { - chrp = 1; - } else if (chrp == 1) { - if (strcasecmp(tagbuf, "boot-script") == 0) { - script = 1; - scriptlen = 0; - } else if (strcasecmp(tagbuf, "/boot-script") == 0) { - - script = 0; - bootscript[scriptlen] = '\0'; - - CHRP_DPRINTF("got bootscript %s\n", bootscript); - - encode_bootpath(of_path, param); - - feval(bootscript); - - break; - } else if (strcasecmp(tagbuf, "/chrp-boot") == 0) - break; - } - } else if (tag && taglen < sizeof(tagbuf)) { - tagbuf[taglen++] = c; - } else if (script && c == '&') { - entity = 1; - taglen = 0; - } else if (entity && c ==';') { - entity = 0; - tagbuf[taglen] = '\0'; - if (strcasecmp(tagbuf, "lt") == 0) { - bootscript[scriptlen++] = '<'; - } else if (strcasecmp(tagbuf, "gt") == 0) { - bootscript[scriptlen++] = '>'; - } else if (strcasecmp(tagbuf, "device") == 0) { - strcpy(bootscript + scriptlen, device); - scriptlen += strlen(device); - } else if (strcasecmp(tagbuf, "partition") == 0) { - if (partition != -1) - sprintf(bootscript + scriptlen, "%d", partition); - else - *(bootscript + scriptlen) = 0; - scriptlen = strlen(bootscript); - } else if (strcasecmp(tagbuf, "directory") == 0) { - strcpy(bootscript + scriptlen, directory); - scriptlen += strlen(directory); - } else if (strcasecmp(tagbuf, "filename") == 0) { - strcpy(bootscript + scriptlen, filename); - scriptlen += strlen(filename); - } else if (strcasecmp(tagbuf, "full-path") == 0) { - strcpy(bootscript + scriptlen, of_path); - scriptlen += strlen(of_path); - } else { /* unknown, keep it */ - bootscript[scriptlen] = '&'; - strcpy(bootscript + scriptlen + 1, tagbuf); - scriptlen += taglen + 1; - bootscript[scriptlen] = ';'; - scriptlen++; - } - } else if (entity && taglen < sizeof(tagbuf)) { - tagbuf[taglen++] = c; - } else if (script && scriptlen < size) { - bootscript[scriptlen++] = c; - } - } - - free(bootscript); + feval("go"); } #define OLDWORLD_BOOTCODE_BASEADDR (0x3f4000) Modified: trunk/openbios-devel/config/scripts/switch-arch =================================================================== --- trunk/openbios-devel/config/scripts/switch-arch 2009-09-20 19:32:30 UTC (rev 583) +++ trunk/openbios-devel/config/scripts/switch-arch 2009-09-20 20:15:46 UTC (rev 584) @@ -122,7 +122,7 @@ ;; sparc32) - TARGET="sparc-elf-" + TARGET="sparc-linux-gnu-" CFLAGS="-Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc -fno-builtin" AS_FLAGS="-Wa,-xarch=v8 -Wa,-32" ;; Modified: trunk/openbios-devel/forth/debugging/client.fs =================================================================== --- trunk/openbios-devel/forth/debugging/client.fs 2009-09-20 19:32:30 UTC (rev 583) +++ trunk/openbios-devel/forth/debugging/client.fs 2009-09-20 20:15:46 UTC (rev 584) @@ -181,6 +181,8 @@ variable elf-entry variable xcoff-entry +variable bootinfo-entry +variable bootinfo-size : init-program-elf elf file-type ! @@ -317,7 +319,15 @@ ." go is not yet implemented" [THEN] else - ." go is not yet implemented" + bootinfo file-type @ = if +[IFDEF] CONFIG_PPC + bootinfo-entry @ bootinfo-size @ evaluate +[ELSE] + ." go is not yet implemented" +[THEN] + else + ." go is not yet implemented" + then then then ; Added: trunk/openbios-devel/modules/bootinfo-loader.c =================================================================== --- trunk/openbios-devel/modules/bootinfo-loader.c (rev 0) +++ trunk/openbios-devel/modules/bootinfo-loader.c 2009-09-20 20:15:46 UTC (rev 584) @@ -0,0 +1,242 @@ +/* + * + * <bootinfo-loader.c> + * + * bootinfo file loader + * + * Copyright (C) 2009 Laurent Vivier (Laurent(a)vivier.eu) + * + * Original XML parser by Blue Swirl <blauwirbel(a)gmail.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 + * + */ + +#include "openbios/config.h" +#include "openbios/bindings.h" +#include "modules.h" +#include "ofmem.h" +#include "stdio.h" + +//#define DEBUG_BOOTINFO + +#ifdef DEBUG_BOOTINFO +#define DPRINTF(fmt, args...) \ + do { printk("%s: " fmt, __func__ , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) \ + do { } while (0) +#endif + +DECLARE_NODE(bootinfo_loader, INSTALL_OPEN, 0, "+/packages/bootinfo-loader" ); + +static char * +get_device( const char *path ) +{ + int i; + static char buf[1024]; + + for (i = 0; i < sizeof(buf) && path[i] && path[i] != ':'; i++) + buf[i] = path[i]; + buf[i] = 0; + + return buf; +} + +static int +get_partition( const char *path ) +{ + while ( *path && *path != ':' ) + path++; + + if (!*path) + return -1; + path++; + + if (!strchr(path, ',')) /* check if there is a ',' */ + return -1; + + return atol(path); +} + +static char * +get_filename( const char * path , char **dirname) +{ + static char buf[1024]; + char *filename; + + while ( *path && *path != ':' ) + path++; + + if (!*path) { + *dirname = NULL; + return NULL; + } + path++; + + while ( *path && isdigit(*path) ) + path++; + + if (*path == ',') + path++; + + strncpy(buf, path, sizeof(buf)); + buf[sizeof(buf) - 1] = 0; + + filename = strrchr(buf, '\\'); + if (filename) { + *dirname = buf; + (*filename++) = 0; + } else { + *dirname = NULL; + filename = buf; + } + + return filename; +} + +/* + Parse SGML structure like: + <chrp-boot> + <description>Debian/GNU Linux Installation on IBM CHRP hardware</description> + <os-name>Debian/GNU Linux for PowerPC</os-name> + <boot-script>boot &device;:\install\yaboot</boot-script> + <icon size=64,64 color-space=3,3,2> + + CHRP system bindings are described at: + http://playground.sun.com/1275/bindings/chrp/chrp1_7a.ps +*/ + +static void +bootinfo_loader_init_program( void *dummy ) +{ + char *base; + int proplen; + phandle_t chosen; + int tag, taglen, script, scriptlen, entity, chrp; + char tagbuf[128], c; + char *device, *filename, *directory; + int partition; + int current, size; + char *bootscript; + char *tmp; + char bootpath[1024]; + + chosen = find_dev("/chosen"); + tmp = get_property(chosen, "bootpath", &proplen); + memcpy(bootpath, tmp, proplen); + bootpath[proplen] = 0; + + DPRINTF("bootpath %s\n", bootpath); + + device = get_device(bootpath); + partition = get_partition(bootpath); + filename = get_filename(bootpath, &directory); + + feval("load-base"); + base = (char*)POP(); + + feval("load-size"); + size = POP(); + + bootscript = malloc(size); + if (bootscript == NULL) { + DPRINTF("Can't malloc %d bytes\n", size); + return; + } + + chrp = 0; + tag = 0; + taglen = 0; + script = 0; + scriptlen = 0; + entity = 0; + current = 0; + while (current < size) { + + c = base[current++]; + + if (c == '<') { + script = 0; + tag = 1; + taglen = 0; + } else if (c == '>') { + tag = 0; + tagbuf[taglen] = '\0'; + if (strcasecmp(tagbuf, "chrp-boot") == 0) { + chrp = 1; + } else if (chrp == 1) { + if (strcasecmp(tagbuf, "boot-script") == 0) { + script = 1; + scriptlen = 0; + } else if (strcasecmp(tagbuf, "/boot-script") == 0) { + + script = 0; + bootscript[scriptlen] = '\0'; + + DPRINTF("got bootscript %s\n", + bootscript); + + /* FIXME: should initialize saved-program-state. */ + push_str(bootscript); + feval("bootinfo-size ! bootinfo-entry !"); + + break; + } else if (strcasecmp(tagbuf, "/chrp-boot") == 0) + break; + } + } else if (tag && taglen < sizeof(tagbuf)) { + tagbuf[taglen++] = c; + } else if (script && c == '&') { + entity = 1; + taglen = 0; + } else if (entity && c ==';') { + entity = 0; + tagbuf[taglen] = '\0'; + if (strcasecmp(tagbuf, "lt") == 0) { + bootscript[scriptlen++] = '<'; + } else if (strcasecmp(tagbuf, "gt") == 0) { + bootscript[scriptlen++] = '>'; + } else if (strcasecmp(tagbuf, "device") == 0) { + strcpy(bootscript + scriptlen, device); + scriptlen += strlen(device); + } else if (strcasecmp(tagbuf, "partition") == 0) { + if (partition != -1) + sprintf(bootscript + scriptlen, "%d", partition); + else + *(bootscript + scriptlen) = 0; + scriptlen = strlen(bootscript); + } else if (strcasecmp(tagbuf, "directory") == 0) { + strcpy(bootscript + scriptlen, directory); + scriptlen += strlen(directory); + } else if (strcasecmp(tagbuf, "filename") == 0) { + strcpy(bootscript + scriptlen, filename); + scriptlen += strlen(filename); + } else if (strcasecmp(tagbuf, "full-path") == 0) { + strcpy(bootscript + scriptlen, bootpath); + scriptlen += strlen(bootpath); + } else { /* unknown, keep it */ + bootscript[scriptlen] = '&'; + strcpy(bootscript + scriptlen + 1, tagbuf); + scriptlen += taglen + 1; + bootscript[scriptlen] = ';'; + scriptlen++; + } + } else if (entity && taglen < sizeof(tagbuf)) { + tagbuf[taglen++] = c; + } else if (script && scriptlen < size) { + bootscript[scriptlen++] = c; + } + } +} + +NODE_METHODS( bootinfo_loader ) = { + { "init-program", bootinfo_loader_init_program }, +}; + +void bootinfo_loader_init( void ) +{ + REGISTER_NODE( bootinfo_loader ); +} Modified: trunk/openbios-devel/modules/build.xml =================================================================== --- trunk/openbios-devel/modules/build.xml 2009-09-20 19:32:30 UTC (rev 583) +++ trunk/openbios-devel/modules/build.xml 2009-09-20 20:15:46 UTC (rev 584) @@ -26,6 +26,7 @@ <object source="ofmem_common.c" condition="OFMEM"/> <object source="elf-loader.c" condition="PPC"/> <object source="xcoff-loader.c" condition="PPC"/> + <object source="bootinfo-loader.c" condition="PPC"/> </library> <dictionary name="openbios" target="forth"> Modified: trunk/openbios-devel/modules/init.c =================================================================== --- trunk/openbios-devel/modules/init.c 2009-09-20 19:32:30 UTC (rev 583) +++ trunk/openbios-devel/modules/init.c 2009-09-20 20:15:46 UTC (rev 584) @@ -45,5 +45,6 @@ #ifdef CONFIG_PPC elf_loader_init(); xcoff_loader_init(); + bootinfo_loader_init(); #endif } Modified: trunk/openbios-devel/modules/modules.h =================================================================== --- trunk/openbios-devel/modules/modules.h 2009-09-20 19:32:30 UTC (rev 583) +++ trunk/openbios-devel/modules/modules.h 2009-09-20 20:15:46 UTC (rev 584) @@ -26,5 +26,6 @@ extern void cmdline_init( void ); extern void elf_loader_init( void ); extern void xcoff_loader_init( void ); +extern void bootinfo_loader_init( void ); #endif /* _H_MODULES */

1 0

r583 - trunk/openbios-devel/forth/debugging
by svn＠openbios.org 20 Sep '09

20 Sep '09

Author: laurent Date: 2009-09-20 21:32:30 +0200 (Sun, 20 Sep 2009) New Revision: 583 Modified: trunk/openbios-devel/forth/debugging/client.fs Log: When "load" is used, correctly set bootpath and bootargs. Signed-off-by: Laurent Vivier <Laurent(a)Vivier.eu> Modified: trunk/openbios-devel/forth/debugging/client.fs =================================================================== --- trunk/openbios-devel/forth/debugging/client.fs 2009-09-20 04:20:48 UTC (rev 582) +++ trunk/openbios-devel/forth/debugging/client.fs 2009-09-20 19:32:30 UTC (rev 583) @@ -276,16 +276,19 @@ then ; -: encode-bootpath ( str len -- ) - \ FIXME: need to extract bootargs from bootpath and set it in /chosen +: (encode-bootpath) ( "{params}<cr>" -- bootpath-str bootpath-len) + bl parse 2dup " /chosen" (find-dev) if " bootpath" rot (property) then + linefeed parse + " /chosen" (find-dev) if + " bootargs" rot (property) + then ; : load ( "{params}<cr>" -- ) - linefeed parse ( str len ) - 2dup encode-bootpath + (encode-bootpath) open-dev ( ihandle ) dup 0= if drop

1 0