OpenBIOS August 2009

openbios@openbios.org

14 participants
81 discussions

r544 - trunk/openbios-devel/arch/ppc/qemu
by svn＠openbios.org 10 Aug '09

10 Aug '09

Author: laurent Date: 2009-08-10 21:50:04 +0200 (Mon, 10 Aug 2009) New Revision: 544 Modified: trunk/openbios-devel/arch/ppc/qemu/main.c Log: try_chrp_script() now accepts a third parameter which indicates the script to be loaded and parsed. It will also terminate parsing on the '</chrp-boot>' tag, which makes locating embedded data after the script easier. Signed-off-by: Steven Noonan <steven(a)uplinklabs.net> (laurent: remove XCOFF placeholder) Modified: trunk/openbios-devel/arch/ppc/qemu/main.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c 2009-08-08 22:42:52 UTC (rev 543) +++ trunk/openbios-devel/arch/ppc/qemu/main.c 2009-08-10 19:50:04 UTC (rev 544) @@ -223,21 +223,21 @@ http://playground.sun.com/1275/bindings/chrp/chrp1_7a.ps */ static void -try_bootinfo(const char *path, const char *param) +try_chrp_script(const char *of_path, const char *param, const char *script_path) { int fd, len, tag, taglen, script, scriptlen, entity; char tagbuf[256], bootscript[256], c; char *device, *filename, *directory; int partition; - device = get_device(path); - partition = get_partition(path); - filename = get_filename(path, &directory); + device = get_device(of_path); + partition = get_partition(of_path); + filename = get_filename(of_path, &directory); /* read boot script */ - snprintf(bootscript, sizeof(bootscript), "%s:%d,ppc\\bootinfo.txt", - device, partition); + snprintf(bootscript, sizeof(bootscript), "%s:%d,%s", + device, partition, script_path); ELF_DPRINTF("Trying %s\n", bootscript); if ((fd = open_io(bootscript)) == -1) { @@ -267,10 +267,10 @@ tagbuf[taglen] = '\0'; if (strcasecmp(tagbuf, "boot-script") == 0) script = 1; - else if (strcasecmp(tagbuf, "/boot-script") == 0) { + else if (strcasecmp(tagbuf, "/boot-script") == 0) bootscript[scriptlen] = '\0'; - break; - } + else if (strcasecmp(tagbuf, "/chrp-boot") == 0) + break; } else if (tag && taglen < sizeof(tagbuf)) { tagbuf[taglen++] = c; } else if (script && c == '&') { @@ -292,8 +292,8 @@ strcpy(bootscript + scriptlen, filename); scriptlen += strlen(filename); } else if (strcasecmp(tagbuf, "full-path") == 0) { - strcpy(bootscript + scriptlen, path); - scriptlen += strlen(path); + strcpy(bootscript + scriptlen, of_path); + scriptlen += strlen(of_path); } else { /* unknown, keep it */ bootscript[scriptlen] = '&'; strcpy(bootscript + scriptlen + 1, tagbuf); @@ -310,7 +310,7 @@ ELF_DPRINTF("got bootscript %s\n", bootscript); - encode_bootpath(path, param); + encode_bootpath(of_path, param); feval(bootscript); badf: @@ -386,7 +386,8 @@ static void yaboot_startup( void ) { - static const char * const paths[] = { "hd:2,\\ofclient", "hd:2,\\yaboot" }; + static const char * const chrp_paths[] = { "ppc\\bootinfo.txt", "System\\Library\\CoreServices\\BootX" }; + static const char * const elf_paths[] = { "hd:2,\\ofclient", "hd:2,\\yaboot" }; static const char * const args[] = { "", "conf=hd:2,\\yaboot.conf" }; char *path = pop_fstr_copy(), *param; int i; @@ -420,7 +421,9 @@ param = pop_fstr_copy(); } try_path(path, param); - try_bootinfo(path, param); + for( i=0; i < sizeof(chrp_paths) / sizeof(chrp_paths[0]); i++ ) { + try_chrp_script(path, param, chrp_paths[i]); + } } else { uint16_t boot_device = fw_cfg_read_i16(FW_CFG_BOOT_DEVICE); switch (boot_device) { @@ -432,15 +435,19 @@ path = strdup("cd:0"); break; } - try_bootinfo(path, NULL); + for( i=0; i < sizeof(chrp_paths) / sizeof(chrp_paths[0]); i++ ) { + try_chrp_script(path, param, chrp_paths[i]); + } } } else { ELF_DPRINTF("Entering boot, path %s\n", path); try_path(path, param); - try_bootinfo(path, param); + for( i=0; i < sizeof(chrp_paths) / sizeof(chrp_paths[0]); i++ ) { + try_chrp_script(path, param, chrp_paths[i]); + } } - for( i=0; i < sizeof(paths) / sizeof(paths[0]); i++ ) { - try_path(paths[i], args[i]); + for( i=0; i < sizeof(elf_paths) / sizeof(elf_paths[0]); i++ ) { + try_path(elf_paths[i], args[i]); } printk("*** Boot failure! No secondary bootloader specified ***\n"); }

1 0

Re: [OpenBIOS] [RFC] Make BootX from Mac OS X 10.4 work
by Laurent Vivier 10 Aug '09

10 Aug '09

> >On 10.08.2009, at 00:51, Laurent Vivier wrote: > >> Le jeudi 30 juillet 2009 à 18:00 +0200, Alexander Graf a écrit : >>> Using this patch stacked on Steven Noonan's I was able to make >>> BootX from >>> Mac OS X 10.4 load XNU successfully in qemu-system-ppc. >> >> Hi, >> >> I'd like to play with that. >> >> Which patches to apply before ? > >I took those rebased on current git: > >http://github.com/tycho/openbios/tree/macosx-boot > >> How to boot ? > >The normal way. Just use -boot d. So far only the 10.4 CD did boot IIRC. > >Alex > >> >> Regards, >> Laurent >> >>> Unfortunately, most of this patch is nothing but a mere hack to >>> find out >>> what we really need to get this working. >>> >>> Also I didn't manage to get anything but 10.4 running. Other >>> versions broke >>> in the partition table interpretation. >>> >>> I would not feel good taking the patch as is, because it would be >>> better to >>> implement the correct Forth magic to make the real callbacks work. >>> Here is >>> what I found to be broken: >>> >>> - unselect-dev is missing >>> - local variables don't work ({ ... }) >>> - I ran into an endless loop, getting isi and dsi faults on the >>> same 2 >>> addresses all the time >>> >>> Also, Qemu's only usable Desktop PPC target is a G3 Beige which is >>> only >>> supported up to 10.2.8 IIRC. So even getting the bootloader running >>> for >>> 10.4 didn't exactly buy me much. >>> >>> Don't apply the patch as is! >>> It'd be great to see someone build on this! >>> --- >>> arch/ppc/qemu/ofmem.c | 4 ++-- >>> modules/client.c | 40 ++++++++++++++++++++++++++++++++++++++++ >>> 2 files changed, 42 insertions(+), 2 deletions(-) >>> >>> diff --git a/arch/ppc/qemu/ofmem.c b/arch/ppc/qemu/ofmem.c >>> index a1a8fb1..32642e2 100644 >>> --- a/arch/ppc/qemu/ofmem.c >>> +++ b/arch/ppc/qemu/ofmem.c >>> @@ -716,8 +716,8 @@ hash_page_32( ulong ea, ulong phys, int mode ) >>> >>> /* out of slots, just evict one */ >>> if( !found ) { >>> - i = next_grab_slot + 1; >>> - next_grab_slot = (next_grab_slot + 1) % 8; >>> + i = next_grab_slot + 3; >>> + next_grab_slot = (next_grab_slot + 3) % 8; >>> } >>> i--; >>> upte[i*2] = cmp; >>> diff --git a/modules/client.c b/modules/client.c >>> index a2e8405..a8c89ff 100644 >>> --- a/modules/client.c >>> +++ b/modules/client.c >>> @@ -49,6 +49,46 @@ handle_calls( prom_args_t *pb ) >>> pb->nargs, pb->nret); >>> #endif >>> >>> +#if 1 >>> + if (!strcmp(pb->service, "interpret")) >>> + { >>> + char *ns; >>> + >>> + ns = strstr((char*)pb->args[0], "{ ; dpth }"); >>> + if (ns) return 0; >>> + >>> + ns = strstr((char*)pb->args[0], "dev /chosen "); >>> + if (ns) memcpy(ns, " \" /chosen\"", 11); >>> + } >>> + else if (!strcmp(pb->service, "call-method")) >>> + { >>> + if (!strncmp((char*)pb->args[0], "slw_init_keymap", 15)) { >>> + >>> + char *a = (char*)malloc(20); >>> + memset(a, 0x00, 20); >>> + pb->args[4] = (uint32_t)a; >>> + pb->args[3] = 0; >>> + >>> + return 0; >>> + } >>> + if (!strncmp((char*)pb->args[0], "slw_emit", >>> strlen("slw_emit"))) { >>> + PUSH( (char)pb->args[2] ); >>> + fword("emit"); >>> + >>> + return 0; >>> + } >>> + if (!strncmp((char*)pb->args[0], "slw_cr", strlen("slw_cr"))) { >>> + PUSH( '\n' ); >>> + fword("emit"); >>> + return 0; >>> + } >>> + if (!strncmp((char*)pb->args[0], "slw_update_keymap", >>> strlen("slw_update_keymap"))) return 0; >>> + if (!strncmp((char*)pb->args[0], "slw_set_output_level", >>> strlen("slw_set_output_level"))) return 0; >>> + if (!strncmp((char*)pb->args[0], "slw_spin_init", >>> strlen("slw_spin_init"))) return 0; >>> + if (!strncmp((char*)pb->args[0], "slw_spin", >>> strlen("slw_spin"))) return 0; >>> + } >>> +#endif >>> + >>> for( i=pb->nargs-1; i>=0; i-- ) >>> PUSH( pb->args[i] ); >>> >>> -- >>> 1.6.0.2 >>> >>> >> -- >> --------------------- laurent(a)vivier.eu ---------------------- >> "Tout ce qui est impossible reste à accomplir" Jules Verne >> "Things are only impossible until they're not" Jean-Luc Picard >> >> >> -- >> OpenBIOS http://openbios.org/ >> Mailinglist: http://lists.openbios.org/mailman/listinfo >> Free your System - May the Forth be with you > > >-- >OpenBIOS http://openbios.org/ >Mailinglist: http://lists.openbios.org/mailman/listinfo >Free your System - May the Forth be with you -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

1 0

[RFC] Make BootX from Mac OS X 10.4 work
by Alexander Graf 10 Aug '09

10 Aug '09

Using this patch stacked on Steven Noonan's I was able to make BootX from Mac OS X 10.4 load XNU successfully in qemu-system-ppc. Unfortunately, most of this patch is nothing but a mere hack to find out what we really need to get this working. Also I didn't manage to get anything but 10.4 running. Other versions broke in the partition table interpretation. I would not feel good taking the patch as is, because it would be better to implement the correct Forth magic to make the real callbacks work. Here is what I found to be broken: - unselect-dev is missing - local variables don't work ({ ... }) - I ran into an endless loop, getting isi and dsi faults on the same 2 addresses all the time Also, Qemu's only usable Desktop PPC target is a G3 Beige which is only supported up to 10.2.8 IIRC. So even getting the bootloader running for 10.4 didn't exactly buy me much. Don't apply the patch as is! It'd be great to see someone build on this! --- arch/ppc/qemu/ofmem.c | 4 ++-- modules/client.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/arch/ppc/qemu/ofmem.c b/arch/ppc/qemu/ofmem.c index a1a8fb1..32642e2 100644 --- a/arch/ppc/qemu/ofmem.c +++ b/arch/ppc/qemu/ofmem.c @@ -716,8 +716,8 @@ hash_page_32( ulong ea, ulong phys, int mode ) /* out of slots, just evict one */ if( !found ) { - i = next_grab_slot + 1; - next_grab_slot = (next_grab_slot + 1) % 8; + i = next_grab_slot + 3; + next_grab_slot = (next_grab_slot + 3) % 8; } i--; upte[i*2] = cmp; diff --git a/modules/client.c b/modules/client.c index a2e8405..a8c89ff 100644 --- a/modules/client.c +++ b/modules/client.c @@ -49,6 +49,46 @@ handle_calls( prom_args_t *pb ) pb->nargs, pb->nret); #endif +#if 1 + if (!strcmp(pb->service, "interpret")) + { + char *ns; + + ns = strstr((char*)pb->args[0], "{ ; dpth }"); + if (ns) return 0; + + ns = strstr((char*)pb->args[0], "dev /chosen "); + if (ns) memcpy(ns, " \" /chosen\"", 11); + } + else if (!strcmp(pb->service, "call-method")) + { + if (!strncmp((char*)pb->args[0], "slw_init_keymap", 15)) { + + char *a = (char*)malloc(20); + memset(a, 0x00, 20); + pb->args[4] = (uint32_t)a; + pb->args[3] = 0; + + return 0; + } + if (!strncmp((char*)pb->args[0], "slw_emit", strlen("slw_emit"))) { + PUSH( (char)pb->args[2] ); + fword("emit"); + + return 0; + } + if (!strncmp((char*)pb->args[0], "slw_cr", strlen("slw_cr"))) { + PUSH( '\n' ); + fword("emit"); + return 0; + } + if (!strncmp((char*)pb->args[0], "slw_update_keymap", strlen("slw_update_keymap"))) return 0; + if (!strncmp((char*)pb->args[0], "slw_set_output_level", strlen("slw_set_output_level"))) return 0; + if (!strncmp((char*)pb->args[0], "slw_spin_init", strlen("slw_spin_init"))) return 0; + if (!strncmp((char*)pb->args[0], "slw_spin", strlen("slw_spin"))) return 0; + } +#endif + for( i=pb->nargs-1; i>=0; i-- ) PUSH( pb->args[i] ); -- 1.6.0.2

4 8

r543 - trunk/openbios-devel/modules
by svn＠openbios.org 08 Aug '09

08 Aug '09

Author: laurent Date: 2009-08-09 00:42:52 +0200 (Sun, 09 Aug 2009) New Revision: 543 Modified: trunk/openbios-devel/modules/disk-label.c Log: Add DPRINTF() to disk-label.c Modified: trunk/openbios-devel/modules/disk-label.c =================================================================== --- trunk/openbios-devel/modules/disk-label.c 2009-08-08 22:00:10 UTC (rev 542) +++ trunk/openbios-devel/modules/disk-label.c 2009-08-08 22:42:52 UTC (rev 543) @@ -19,6 +19,15 @@ #include "libc/diskio.h" #include "modules.h" +//#define DEBUG_DISK_LABEL + +#ifdef DEBUG_DISK_LABEL +#define DPRINTF(fmt, args...) \ +do { printk("DISK-LABEL - %s: " fmt, __func__ , ##args); } while (0) +#else +#define DPRINTF(fmt, args...) do { } while (0) +#endif + typedef struct { int fd; @@ -55,7 +64,7 @@ xt_t xt; parstr = my_args_copy(); - /* printk("dlabel-open '%s'\n", parstr ); */ + DPRINTF("dlabel-open '%s'\n", parstr ); if( (fd=open_ih(my_parent())) == -1 ) goto out; @@ -79,6 +88,7 @@ filename++; } } + DPRINTF("parstr %s filename %s\n", parstr, filename); /* try to see if there is a filesystem without partition */ @@ -181,13 +191,13 @@ if( pos != -1 ) pos += offs; else if( size ) { - /* printk("Seek EOF\n"); */ + DPRINTF("Seek EOF\n"); pos = offs + size; } else { /* let parent handle the EOF seek. */ } - /* printk("dlabel_seek: %x %08x\n", (int)(pos>>32), (int)pos ); */ + DPRINTF("dlabel_seek: %x %08x\n", (int)(pos>>32), (int)pos ); ret = seek_io( di->fd, pos ); PUSH( ret ); }

1 0

r542 - trunk/openbios-devel/modules
by svn＠openbios.org 08 Aug '09

08 Aug '09

Author: laurent Date: 2009-08-09 00:00:10 +0200 (Sun, 09 Aug 2009) New Revision: 542 Modified: trunk/openbios-devel/modules/mac-parts.c trunk/openbios-devel/modules/mac-parts.h Log: If the partition type is the mac partition type, this patch allows to not select the partition to boot from but to boot from the first bootable partition. "PowerPC Microprocessor Common Hardware Reference Platform (CHRP) System binding to: IEEE Std 1275-1994 Standard for Boot (Initialization, Configuration) Firmware Revision: 1.8" "Chapter 11.1.2. Open Method Algorith" "[...] If the partition component is present, it selects the desired partition, where partition 0 refers to the entire disk, partition 1 refers to the first partition, partition 2 to the second, and so forth. If the partition component is absent and the disk has an FDISK or Mac partition, the first "bootable" partition is used. [...]" Modified: trunk/openbios-devel/modules/mac-parts.c =================================================================== --- trunk/openbios-devel/modules/mac-parts.c 2009-08-08 21:56:26 UTC (rev 541) +++ trunk/openbios-devel/modules/mac-parts.c 2009-08-08 22:00:10 UTC (rev 542) @@ -45,23 +45,21 @@ char *str = my_args_copy(); xt_t seek_xt = find_parent_method("seek"); xt_t read_xt = find_parent_method("read"); - int bs, parnum=-1; + int bs, parnum=0; desc_map_t dmap; part_entry_t par; + int ret = 0; if( str ) { parnum = atol(str); - if( !strlen(str) ) - parnum = 1; - free( str ); + if( *str == 0 || *str == ',' ) + parnum = -1; } - if( parnum < 0 ) - parnum = 0; DPRINTF("macparts_open %d\n", parnum); SEEK( 0 ); if( READ(&dmap, sizeof(dmap)) != sizeof(dmap) ) - RET(0); + goto out; /* partition maps might support multiple block sizes; in this case, * pmPyPartStart is typically given in terms of 512 byte blocks. @@ -70,33 +68,75 @@ if( bs != 512 ) { SEEK( 512 ); READ( &par, sizeof(par) ); - if( par.pmSig == 0x504d /* 'PM' */ ) + if( par.pmSig == DESC_PART_SIGNATURE ) bs = 512; } + SEEK( bs ); + if( READ(&par, sizeof(par)) != sizeof(par) ) + goto out; + if (par.pmSig != DESC_PART_SIGNATURE) + goto out; + + if (parnum == -1) { + /* search a bootable partition */ + /* see PowerPC Microprocessor CHRP bindings */ + + parnum = 1; + while (parnum <= par.pmMapBlkCnt) { + SEEK( (bs * parnum) ); + READ( &par, sizeof(par) ); + if( par.pmSig != DESC_PART_SIGNATURE || + !par.pmPartBlkCnt ) + goto out; + + if( (par.pmPartStatus & kPartitionAUXIsBootValid) && + (par.pmPartStatus & kPartitionAUXIsValid) && + (par.pmPartStatus & kPartitionAUXIsAllocated) && + (par.pmPartStatus & kPartitionAUXIsReadable) && + (strcmp(par.pmProcessor, "PowerPC") == 0) ) { + di->blocksize =(uint)bs; + di->offs = (llong)par.pmPyPartStart * bs; + di->size = (llong)par.pmPartBlkCnt * bs; + ret = -1; + goto out; + } + + parnum++; + } + /* not found */ + ret = 0; + goto out; + } + if (parnum == 0) { di->blocksize =(uint)bs; di->offs = (llong)0; di->size = (llong)dmap.sbBlkCount * bs; - PUSH( -1 ); - return; + ret = -1; + goto out; } - SEEK( bs ); - if( READ(&par, sizeof(par)) != sizeof(par) ) - RET(0); - if( parnum > par.pmMapBlkCnt || par.pmSig != 0x504d /* 'PM' */ ) - RET(0); + if( parnum > par.pmMapBlkCnt) + goto out; + SEEK( (bs * parnum) ); READ( &par, sizeof(par) ); + if( par.pmSig != DESC_PART_SIGNATURE || !par.pmPartBlkCnt ) + goto out; + if( !(par.pmPartStatus & kPartitionAUXIsValid) || + !(par.pmPartStatus & kPartitionAUXIsAllocated) || + !(par.pmPartStatus & kPartitionAUXIsReadable) ) + goto out; - if( par.pmSig != 0x504d /* 'PM' */ || !par.pmPartBlkCnt ) - RET(0); - + ret = -1; di->blocksize =(uint)bs; di->offs = (llong)par.pmPyPartStart * bs; di->size = (llong)par.pmPartBlkCnt * bs; - PUSH( -1 ); +out: + if (str) + free(str); + PUSH( ret); } /* ( block0 -- flag? ) */ Modified: trunk/openbios-devel/modules/mac-parts.h =================================================================== --- trunk/openbios-devel/modules/mac-parts.h 2009-08-08 21:56:26 UTC (rev 541) +++ trunk/openbios-devel/modules/mac-parts.h 2009-08-08 22:00:10 UTC (rev 542) @@ -20,7 +20,23 @@ /* This information is based upon IM vol V. */ #define DESC_MAP_SIGNATURE 0x4552 +#define DESC_PART_SIGNATURE 0x504d +enum { + kPartitionAUXIsValid = 0x00000001, + kPartitionAUXIsAllocated = 0x00000002, + kPartitionAUXIsInUse = 0x00000004, + kPartitionAUXIsBootValid = 0x00000008, + kPartitionAUXIsReadable = 0x00000010, + kPartitionAUXIsWriteable = 0x00000020, + kPartitionAUXIsBootCodePositionIndependent = 0x00000040, + kPartitionISMountedAtStartup = 0x40000000, + kPartitionIsStartup = 0x80000000, + kPartitionIsChainCompatible = 0x00000100, + kPartitionIsRealDeviceDriver = 0x00000200, + kPartitionCanChainToNext = 0x00000400, +}; + typedef struct { long ddBlock; /* first block of driver */ short ddSize; /* driver size in blocks */

1 0

r541 - trunk/openbios-devel/arch/ppc/qemu
by svn＠openbios.org 08 Aug '09

08 Aug '09

Author: laurent Date: 2009-08-08 23:56:26 +0200 (Sat, 08 Aug 2009) New Revision: 541 Modified: trunk/openbios-devel/arch/ppc/qemu/main.c Log: quik_startup() uses now encode_bootpath() instead of calling find_dev()/set_property(). Modified: trunk/openbios-devel/arch/ppc/qemu/main.c =================================================================== --- trunk/openbios-devel/arch/ppc/qemu/main.c 2009-08-08 14:40:36 UTC (rev 540) +++ trunk/openbios-devel/arch/ppc/qemu/main.c 2009-08-08 21:56:26 UTC (rev 541) @@ -346,7 +346,6 @@ struct first_info fi; } fi; } u; - phandle_t ph; if ((fd = open_io(path)) == -1) { ELF_DPRINTF("Can't open %s\n", path); @@ -367,10 +366,7 @@ if (memcmp(u.fi.fi.quik_vers, "QUIK", 4)) return; - ph = find_dev("/options"); - set_property(ph, "boot-device", path, strlen(path) + 1); - ph = find_dev("/chosen"); - set_property(ph, "bootargs", "Linux", 6); + encode_bootpath(path, "Linux"); if( ofmem_claim( QUIK_FIRST_BASEADDR, len, 0 ) == -1 ) fatal_error("Claim failed!\n");

1 0

r540 - trunk/openbios-devel/config/scripts
by svn＠openbios.org 08 Aug '09

08 Aug '09

Author: blueswirl Date: 2009-08-08 16:40:36 +0200 (Sat, 08 Aug 2009) New Revision: 540 Modified: trunk/openbios-devel/config/scripts/switch-arch Log: Fix leakage of AS_FLAGS between targets Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/config/scripts/switch-arch =================================================================== --- trunk/openbios-devel/config/scripts/switch-arch 2009-08-08 10:52:59 UTC (rev 539) +++ trunk/openbios-devel/config/scripts/switch-arch 2009-08-08 14:40:36 UTC (rev 540) @@ -102,11 +102,13 @@ amd64) TARGET="x86_64-linux-gnu-" CFLAGS="-fno-builtin" + AS_FLAGS= ;; ppc) TARGET="powerpc-linux-gnu-" CFLAGS="-msoft-float -fno-builtin-bcopy -fno-builtin-log2" + AS_FLAGS= ;; sparc32)

1 0

r539 - in trunk/openbios-devel: config/examples drivers include/ppc include/sparc64
by svn＠openbios.org 08 Aug '09

08 Aug '09

Author: blueswirl Date: 2009-08-08 12:52:59 +0200 (Sat, 08 Aug 2009) New Revision: 539 Modified: trunk/openbios-devel/config/examples/cross-sparc64_config.xml trunk/openbios-devel/config/examples/sparc64_config.xml trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/include/ppc/io.h trunk/openbios-devel/include/sparc64/io.h Log: Sparc64: configure screen size from QEMU command line options Configure the screen size from QEMU command line options using FW_CFG interface, like r538 for PPC. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/config/examples/cross-sparc64_config.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-sparc64_config.xml 2009-08-04 21:08:37 UTC (rev 538) +++ trunk/openbios-devel/config/examples/cross-sparc64_config.xml 2009-08-08 10:52:59 UTC (rev 539) @@ -4,6 +4,7 @@  <option name="CONFIG_SPARC" type="boolean" value="true"/> <option name="CONFIG_SPARC64" type="boolean" value="true"/> + <option name="CONFIG_QEMU" type="boolean" value="true"/> <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/>  Modified: trunk/openbios-devel/config/examples/sparc64_config.xml =================================================================== --- trunk/openbios-devel/config/examples/sparc64_config.xml 2009-08-04 21:08:37 UTC (rev 538) +++ trunk/openbios-devel/config/examples/sparc64_config.xml 2009-08-08 10:52:59 UTC (rev 539) @@ -4,6 +4,7 @@  <option name="CONFIG_SPARC" type="boolean" value="true"/> <option name="CONFIG_SPARC64" type="boolean" value="true"/> + <option name="CONFIG_QEMU" type="boolean" value="true"/> <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/>  Modified: trunk/openbios-devel/drivers/vga_vbe.c =================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c 2009-08-04 21:08:37 UTC (rev 538) +++ trunk/openbios-devel/drivers/vga_vbe.c 2009-08-08 10:52:59 UTC (rev 539) @@ -131,11 +131,11 @@ int depth = VGA_DEFAULT_DEPTH; int linebytes = VGA_DEFAULT_LINEBYTES; -#if defined(CONFIG_QEMU) && defined(CONFIG_PPC) +#if defined(CONFIG_QEMU) && (defined(CONFIG_PPC) || defined(CONFIG_SPARC64)) int w, h, d; - w = fw_cfg_read_i16(FW_CFG_PPC_WIDTH); - h = fw_cfg_read_i16(FW_CFG_PPC_HEIGHT); - d = fw_cfg_read_i16(FW_CFG_PPC_DEPTH); + w = fw_cfg_read_i16(FW_CFG_ARCH_WIDTH); + h = fw_cfg_read_i16(FW_CFG_ARCH_HEIGHT); + d = fw_cfg_read_i16(FW_CFG_ARCH_DEPTH); if (w && h && d) { width = w; height = h; Modified: trunk/openbios-devel/include/ppc/io.h =================================================================== --- trunk/openbios-devel/include/ppc/io.h 2009-08-04 21:08:37 UTC (rev 538) +++ trunk/openbios-devel/include/ppc/io.h 2009-08-08 10:52:59 UTC (rev 539) @@ -165,9 +165,9 @@ #endif #if defined(CONFIG_QEMU) -#define FW_CFG_PPC_WIDTH (FW_CFG_ARCH_LOCAL + 0x00) -#define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01) -#define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02) +#define FW_CFG_ARCH_WIDTH (FW_CFG_ARCH_LOCAL + 0x00) +#define FW_CFG_ARCH_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01) +#define FW_CFG_ARCH_DEPTH (FW_CFG_ARCH_LOCAL + 0x02) #endif #endif /* _ASM_IO_H */ Modified: trunk/openbios-devel/include/sparc64/io.h =================================================================== --- trunk/openbios-devel/include/sparc64/io.h 2009-08-04 21:08:37 UTC (rev 538) +++ trunk/openbios-devel/include/sparc64/io.h 2009-08-08 10:52:59 UTC (rev 539) @@ -3,6 +3,9 @@ #include "asm/types.h" +#define NO_QEMU_PROTOS +#include "openbios/fw_cfg.h" + extern unsigned long va_shift; // Set in entry.S // Defined in ldscript extern char _start, _data, _stack, _estack, _end, _vmem, _evmem, _iomem; @@ -213,4 +216,11 @@ extern void outsw(u32 reg, const void *addr, unsigned long count); #endif #endif + +#if defined(CONFIG_QEMU) +#define FW_CFG_ARCH_WIDTH (FW_CFG_ARCH_LOCAL + 0x00) +#define FW_CFG_ARCH_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01) +#define FW_CFG_ARCH_DEPTH (FW_CFG_ARCH_LOCAL + 0x02) +#endif + #endif /* _ASM_IO_H */

1 0

r538 - in trunk/openbios-devel: drivers include/ppc
by svn＠openbios.org 04 Aug '09

04 Aug '09

Author: laurent Date: 2009-08-04 23:08:37 +0200 (Tue, 04 Aug 2009) New Revision: 538 Modified: trunk/openbios-devel/drivers/vga_vbe.c trunk/openbios-devel/include/ppc/io.h Log: Allows to configure screen size from Qemu command line options using FW_CFG interface. Only enabled for PPC/QEMU and VGA/VBE. Modified: trunk/openbios-devel/drivers/vga_vbe.c =================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c 2009-08-04 21:04:32 UTC (rev 537) +++ trunk/openbios-devel/drivers/vga_vbe.c 2009-08-04 21:08:37 UTC (rev 538) @@ -126,16 +126,32 @@ { phandle_t ph, chosen, aliases, options; char buf[6]; + int width = VGA_DEFAULT_WIDTH; + int height = VGA_DEFAULT_HEIGHT; + int depth = VGA_DEFAULT_DEPTH; + int linebytes = VGA_DEFAULT_LINEBYTES; - vga_vbe_set_mode(VGA_DEFAULT_WIDTH, VGA_DEFAULT_HEIGHT, - VGA_DEFAULT_DEPTH); +#if defined(CONFIG_QEMU) && defined(CONFIG_PPC) + int w, h, d; + w = fw_cfg_read_i16(FW_CFG_PPC_WIDTH); + h = fw_cfg_read_i16(FW_CFG_PPC_HEIGHT); + d = fw_cfg_read_i16(FW_CFG_PPC_DEPTH); + if (w && h && d) { + width = w; + height = h; + depth = d; + linebytes = (width * ((depth + 7) / 8)); + } +#endif + vga_vbe_set_mode(width, height, depth); + ph = find_dev(path); - set_int_property(ph, "width", VGA_DEFAULT_WIDTH); - set_int_property(ph, "height", VGA_DEFAULT_HEIGHT); - set_int_property(ph, "depth", VGA_DEFAULT_DEPTH); - set_int_property(ph, "linebytes", VGA_DEFAULT_LINEBYTES); + set_int_property(ph, "width", width); + set_int_property(ph, "height", height); + set_int_property(ph, "depth", depth); + set_int_property(ph, "linebytes", linebytes); set_int_property(ph, "address", fb & ~0x0000000F); chosen = find_dev("/chosen"); @@ -147,9 +163,9 @@ set_property(aliases, "screen", path, strlen(path) + 1); options = find_dev("/options"); - snprintf(buf, sizeof(buf), "%d", VGA_DEFAULT_WIDTH / FONT_WIDTH); + snprintf(buf, sizeof(buf), "%d", width / FONT_WIDTH); set_property(options, "screen-#columns", buf, strlen(buf) + 1); - snprintf(buf, sizeof(buf), "%d", VGA_DEFAULT_HEIGHT / FONT_HEIGHT); + snprintf(buf, sizeof(buf), "%d", height / FONT_HEIGHT); set_property(options, "screen-#rows", buf, strlen(buf) + 1); if (rom_size >= 8) { @@ -164,6 +180,5 @@ } } - init_video(fb, VGA_DEFAULT_WIDTH, VGA_DEFAULT_HEIGHT, - VGA_DEFAULT_DEPTH, VGA_DEFAULT_LINEBYTES); + init_video(fb, width, height, depth, linebytes); } Modified: trunk/openbios-devel/include/ppc/io.h =================================================================== --- trunk/openbios-devel/include/ppc/io.h 2009-08-04 21:04:32 UTC (rev 537) +++ trunk/openbios-devel/include/ppc/io.h 2009-08-04 21:08:37 UTC (rev 538) @@ -3,6 +3,9 @@ #include "asm/types.h" +#define NO_QEMU_PROTOS +#include "openbios/fw_cfg.h" + extern unsigned long virt_offset; #define phys_to_virt(phys) ((void *) ((unsigned long) (phys) - virt_offset)) @@ -160,4 +163,11 @@ extern void outsw(u32 reg, const void *addr, unsigned long count); #endif #endif + +#if defined(CONFIG_QEMU) +#define FW_CFG_PPC_WIDTH (FW_CFG_ARCH_LOCAL + 0x00) +#define FW_CFG_PPC_HEIGHT (FW_CFG_ARCH_LOCAL + 0x01) +#define FW_CFG_PPC_DEPTH (FW_CFG_ARCH_LOCAL + 0x02) +#endif + #endif /* _ASM_IO_H */

1 0

r537 - in trunk/openbios-devel: config/examples drivers
by svn＠openbios.org 04 Aug '09

04 Aug '09

Author: laurent Date: 2009-08-04 23:04:32 +0200 (Tue, 04 Aug 2009) New Revision: 537 Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml trunk/openbios-devel/config/examples/ppc_config.xml trunk/openbios-devel/drivers/vga_vbe.c Log: Allows to configure screen size from the configuration files using CONFIG_VGA_WIDTH, CONFIG_VGA_HEIGHT, CONFIG_VGA_DEPTH. For the moment, only enabled for PPC/QEMU and VGA VBE interface. Modified: trunk/openbios-devel/config/examples/cross-ppc_config.xml =================================================================== --- trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-08-04 20:37:36 UTC (rev 536) +++ trunk/openbios-devel/config/examples/cross-ppc_config.xml 2009-08-04 21:04:32 UTC (rev 537) @@ -37,6 +37,9 @@ <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> <option name="CONFIG_OFMEM" type="boolean" value="true"/> <option name="CONFIG_OFMEM_MALLOC_ALIGN" type="integer" value="4"/> + <option name="CONFIG_VGA_WIDTH" type="integer" value="800"/> + <option name="CONFIG_VGA_HEIGHT" type="integer" value="600"/> + <option name="CONFIG_VGA_DEPTH" type="integer" value="8"/>  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> Modified: trunk/openbios-devel/config/examples/ppc_config.xml =================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml 2009-08-04 20:37:36 UTC (rev 536) +++ trunk/openbios-devel/config/examples/ppc_config.xml 2009-08-04 21:04:32 UTC (rev 537) @@ -35,7 +35,11 @@ <option name="CONFIG_DEBLOCKER" type="boolean" value="true"/> <option name="CONFIG_FONT_8X8" type="boolean" value="true"/> <option name="CONFIG_FONT_8X16" type="boolean" value="false"/> + <option name="CONFIG_VGA_WIDTH" type="integer" value="800"/> + <option name="CONFIG_VGA_HEIGHT" type="integer" value="600"/> + <option name="CONFIG_VGA_DEPTH" type="integer" value="8"/> +  <option name="CONFIG_DISK_LABEL" type="boolean" value="true"/> <option name="CONFIG_PART_SUPPORT" type="boolean" value="true"/> Modified: trunk/openbios-devel/drivers/vga_vbe.c =================================================================== --- trunk/openbios-devel/drivers/vga_vbe.c 2009-08-04 20:37:36 UTC (rev 536) +++ trunk/openbios-devel/drivers/vga_vbe.c 2009-08-04 21:04:32 UTC (rev 537) @@ -101,20 +101,41 @@ vga_build_rgb_palette(); } +#ifdef CONFIG_VGA_WIDTH +#define VGA_DEFAULT_WIDTH CONFIG_VGA_WIDTH +#else +#define VGA_DEFAULT_WIDTH 800 +#endif + +#ifdef CONFIG_VGA_HEIGHT +#define VGA_DEFAULT_HEIGHT CONFIG_VGA_HEIGHT +#else +#define VGA_DEFAULT_HEIGHT 600 +#endif + +#ifdef CONFIG_VGA_DEPTH +#define VGA_DEFAULT_DEPTH CONFIG_VGA_DEPTH +#else +#define VGA_DEFAULT_DEPTH 8 +#endif + +#define VGA_DEFAULT_LINEBYTES (VGA_DEFAULT_WIDTH*((VGA_DEFAULT_DEPTH+7)/8)) + void vga_vbe_init(const char *path, unsigned long fb, uint32_t fb_size, unsigned long rom, uint32_t rom_size) { phandle_t ph, chosen, aliases, options; char buf[6]; - vga_vbe_set_mode(800, 600, 8); + vga_vbe_set_mode(VGA_DEFAULT_WIDTH, VGA_DEFAULT_HEIGHT, + VGA_DEFAULT_DEPTH); ph = find_dev(path); - set_int_property(ph, "width", 800); - set_int_property(ph, "height", 600); - set_int_property(ph, "depth", 8); - set_int_property(ph, "linebytes", 800); + set_int_property(ph, "width", VGA_DEFAULT_WIDTH); + set_int_property(ph, "height", VGA_DEFAULT_HEIGHT); + set_int_property(ph, "depth", VGA_DEFAULT_DEPTH); + set_int_property(ph, "linebytes", VGA_DEFAULT_LINEBYTES); set_int_property(ph, "address", fb & ~0x0000000F); chosen = find_dev("/chosen"); @@ -126,9 +147,9 @@ set_property(aliases, "screen", path, strlen(path) + 1); options = find_dev("/options"); - snprintf(buf, sizeof(buf), "%d", 800 / FONT_WIDTH); + snprintf(buf, sizeof(buf), "%d", VGA_DEFAULT_WIDTH / FONT_WIDTH); set_property(options, "screen-#columns", buf, strlen(buf) + 1); - snprintf(buf, sizeof(buf), "%d", 600 / FONT_HEIGHT); + snprintf(buf, sizeof(buf), "%d", VGA_DEFAULT_HEIGHT / FONT_HEIGHT); set_property(options, "screen-#rows", buf, strlen(buf) + 1); if (rom_size >= 8) { @@ -143,5 +164,6 @@ } } - init_video(fb, 800, 600, 8, 800); + init_video(fb, VGA_DEFAULT_WIDTH, VGA_DEFAULT_HEIGHT, + VGA_DEFAULT_DEPTH, VGA_DEFAULT_LINEBYTES); }

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →