October 2010 - OpenBIOS - mail.coreboot.org

[commit] r893 - trunk/openbios-devel/libopenbios
by repository service Oct. 9, 2010

Oct. 9, 2010

Author: blueswirl Date: Sat Oct 9 12:16:29 2010 New Revision: 893 URL: http://tracker.coreboot.org/trac/openbios/changeset/893 Log: Improve getprop mem dump Currently the whole buffer supplied by the client is traced. AIX uses buffer sizes such as 64, 256, 1024 on properties that might not exist or contain 1 or 8 bytes. Limit the output to the amount of data actually written into the buffer. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/libopenbios/client.c Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Sat Oct 9 12:16:26 2010 (r892) +++ trunk/openbios-devel/libopenbios/client.c Sat Oct 9 12:16:29 2010 (r893) @@ -171,7 +171,8 @@ printk("0x%08lx\n", pb->args[pb->nargs]); } else if (strcmp(pb->service, "getprop") == 0) { printk("%ld\n", pb->args[pb->nargs]); - memdump((char*)pb->args[2], pb->args[3]); + if ((long)pb->args[pb->nargs] != -1) + memdump((char*)pb->args[2], MIN(pb->args[3], pb->args[pb->nargs])); } else if (strcmp(pb->service, "nextprop") == 0) { printk("%ld\n", pb->args[pb->nargs]); memdump((char*)pb->args[2], pb->args[pb->nargs]);

1 0

[commit] r892 - trunk/openbios-devel/arch/ppc/qemu
by repository service Oct. 9, 2010

Oct. 9, 2010

Author: blueswirl Date: Sat Oct 9 12:16:26 2010 New Revision: 892 URL: http://tracker.coreboot.org/trac/openbios/changeset/892 Log: ppc: Fix typos in comment Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/arch/ppc/qemu/start.S Modified: trunk/openbios-devel/arch/ppc/qemu/start.S ============================================================================== --- trunk/openbios-devel/arch/ppc/qemu/start.S Sat Oct 9 12:16:23 2010 (r891) +++ trunk/openbios-devel/arch/ppc/qemu/start.S Sat Oct 9 12:16:26 2010 (r892) @@ -351,9 +351,9 @@ * * MSR = FP, ME + (DR|IR) * r1 = stack (32 K + 32 bytes link area above) - * r5 = clint interface handler + * r5 = client interface handler * r6 = address of client program arguments (unused) - * r7 = length of client program arguments (unsed) + * r7 = length of client program arguments (unused) * * Yaboot and Linux use r3 and r4 for initrd address and size */

1 0

[commit] r891 - trunk/openbios-devel/forth/system
by repository service Oct. 9, 2010

Oct. 9, 2010

Author: blueswirl Date: Sat Oct 9 12:16:23 2010 New Revision: 891 URL: http://tracker.coreboot.org/trac/openbios/changeset/891 Log: Fix test-method argument order test-method for "instantiate-rtas" would fail on the /rtas node. According to CHRP 1.5 draft, the stack order seems reversed. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/forth/system/ciface.fs Modified: trunk/openbios-devel/forth/system/ciface.fs ============================================================================== --- trunk/openbios-devel/forth/system/ciface.fs Sat Oct 9 12:16:21 2010 (r890) +++ trunk/openbios-devel/forth/system/ciface.fs Sat Oct 9 12:16:23 2010 (r891) @@ -314,10 +314,10 @@ \ PowerPC Microprocessor CHRP binding \ 10.5.2. Client Interface -( phandle cstring-method -- missing ) +( cstring-method phandle -- missing ) : test-method - dup cstrlen rot + swap dup cstrlen rot find-method 0= if -1 else drop 0 then ; [THEN]

1 0

[commit] r890 - trunk/openbios-devel/forth/admin
by repository service Oct. 9, 2010

Oct. 9, 2010

Author: blueswirl Date: Sat Oct 9 12:16:21 2010 New Revision: 890 URL: http://tracker.coreboot.org/trac/openbios/changeset/890 Log: Zero-pad byte properties .properties before: someproperty -- 3 : 1 42 3 Now: someproperty -- 3 : 01 42 03 Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/forth/admin/devices.fs Modified: trunk/openbios-devel/forth/admin/devices.fs ============================================================================== --- trunk/openbios-devel/forth/admin/devices.fs Sat Oct 9 12:16:19 2010 (r889) +++ trunk/openbios-devel/forth/admin/devices.fs Sat Oct 9 12:16:21 2010 (r890) @@ -283,7 +283,7 @@ dup r@ + c@ ( len n ch ) - pocket tohexstr type ." " + pocket tohexstr dup 2 <> if ." 0" then type ." " 1+ repeat 2drop r> drop 1

1 0

[commit] r889 - trunk/openbios-devel/libopenbios
by repository service Oct. 9, 2010

Oct. 9, 2010

Author: blueswirl Date: Sat Oct 9 12:16:19 2010 New Revision: 889 URL: http://tracker.coreboot.org/trac/openbios/changeset/889 Log: Fix getprop return value trace Don't trace the buffer length in place of the property size. Signed-off-by: Andreas Färber <andreas.faerber(a)web.de> Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/libopenbios/client.c Modified: trunk/openbios-devel/libopenbios/client.c ============================================================================== --- trunk/openbios-devel/libopenbios/client.c Sat Oct 9 10:27:09 2010 (r888) +++ trunk/openbios-devel/libopenbios/client.c Sat Oct 9 12:16:19 2010 (r889) @@ -170,7 +170,7 @@ } else if (strcmp(pb->service, "getproplen") == 0) { printk("0x%08lx\n", pb->args[pb->nargs]); } else if (strcmp(pb->service, "getprop") == 0) { - printk("%ld\n", pb->args[3]); + printk("%ld\n", pb->args[pb->nargs]); memdump((char*)pb->args[2], pb->args[3]); } else if (strcmp(pb->service, "nextprop") == 0) { printk("%ld\n", pb->args[pb->nargs]);

1 0

[commit] r888 - in trunk/openbios-devel: drivers fs/hfs include/libc
by repository service Oct. 9, 2010

Oct. 9, 2010

Author: blueswirl Date: Sat Oct 9 10:27:09 2010 New Revision: 888 URL: http://tracker.coreboot.org/trac/openbios/changeset/888 Log: Add GCC format attributes to print functions Fix format problems found. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/drivers/pci.c trunk/openbios-devel/fs/hfs/hfs_fs.c trunk/openbios-devel/include/libc/vsprintf.h Modified: trunk/openbios-devel/drivers/pci.c ============================================================================== --- trunk/openbios-devel/drivers/pci.c Tue Oct 5 10:52:49 2010 (r887) +++ trunk/openbios-devel/drivers/pci.c Sat Oct 9 10:27:09 2010 (r888) @@ -297,7 +297,7 @@ case IO_SPACE: /* [n]i[t]DD,F,RR,NNNNNNNN */ - snprintf(buf, sizeof(buf), "%si%s%x,%x,%x,%x", + snprintf(buf, sizeof(buf), "%si%s%x,%x,%x," FMT_ucellx, n ? "n" : "", /* relocatable */ t ? "t" : "", /* aliased */ dev, fn, reg, t ? lo & 0x03FF : lo); @@ -306,7 +306,7 @@ case MEMORY_SPACE_32: /* [n]m[t][p]DD,F,RR,NNNNNNNN */ - snprintf(buf, sizeof(buf), "%sm%s%s%x,%x,%x,%x", + snprintf(buf, sizeof(buf), "%sm%s%s%x,%x,%x," FMT_ucellx, n ? "n" : "", /* relocatable */ t ? "t" : "", /* aliased */ p ? "p" : "", /* prefetchable */ @@ -319,7 +319,7 @@ snprintf(buf, sizeof(buf), "%sx%s%x,%x,%x,%llx", n ? "n" : "", /* relocatable */ p ? "p" : "", /* prefetchable */ - dev, fn, reg, ((uint64_t)mid << 32) | (uint64_t)lo ); + dev, fn, reg, ((long long)mid << 32) | (long long)lo); break; } push_str(buf); Modified: trunk/openbios-devel/fs/hfs/hfs_fs.c ============================================================================== --- trunk/openbios-devel/fs/hfs/hfs_fs.c Tue Oct 5 10:52:49 2010 (r887) +++ trunk/openbios-devel/fs/hfs/hfs_fs.c Sat Oct 9 10:27:09 2010 (r888) @@ -524,7 +524,7 @@ forth_printf("\n"); while( !hfs_readdir(common->dir, &ent) ) { - forth_printf("% 10d ", ent.u.file.dsize); + forth_printf("% 10ld ", ent.u.file.dsize); print_date(ent.mddate); if( ent.flags & HFS_ISDIR ) forth_printf("%s\\\n", ent.name); Modified: trunk/openbios-devel/include/libc/vsprintf.h ============================================================================== --- trunk/openbios-devel/include/libc/vsprintf.h Tue Oct 5 10:52:49 2010 (r887) +++ trunk/openbios-devel/include/libc/vsprintf.h Sat Oct 9 10:27:09 2010 (r888) @@ -20,11 +20,16 @@ #include <stdarg.h> #include "config.h" -extern int vsprintf(char *buf, const char *fmt, va_list args ); -extern int sprintf(char * buf, const char *fmt, ...); -extern int vsnprintf(char *buf, size_t size, const char *fmt, va_list args); -extern int snprintf(char * buf, size_t size, const char *fmt, ...); +int vsprintf(char *buf, const char *fmt, va_list args) + __attribute__((__format__(__printf__, 2, 0))); +int sprintf(char * buf, const char *fmt, ...) + __attribute__((__format__(__printf__, 2, 3))); +int vsnprintf(char *buf, size_t size, const char *fmt, va_list args) + __attribute__((__format__(__printf__, 3, 0))); +int snprintf(char * buf, size_t size, const char *fmt, ...) + __attribute__((__format__(__printf__, 3, 4))); -extern int forth_printf( const char *fmt, ... ); +int forth_printf(const char *fmt, ...) + __attribute__((__format__(__printf__, 1, 2))); #endif /* _H_VSPRINTF */

1 0

[commit] r887 - trunk/openbios-devel/arch/sparc64
by repository service Oct. 5, 2010

Oct. 5, 2010

Author: mcayland Date: Tue Oct 5 10:52:49 2010 New Revision: 887 URL: http://tracker.coreboot.org/trac/openbios/changeset/887 Log: Fix the MMU TLB miss handlers so that they no longer crash when building SPARC64 with -O0. This patch allocates an extra 192 bytes of stack space required by unoptimised gcc builds for saving arguments to the stack. As suggested by Igor previously (see http://lists.openbios.org/pipermail/openbios/2009-July/003762.html and SVN r508). Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc64/vectors.S Modified: trunk/openbios-devel/arch/sparc64/vectors.S ============================================================================== --- trunk/openbios-devel/arch/sparc64/vectors.S Sun Oct 3 22:28:27 2010 (r886) +++ trunk/openbios-devel/arch/sparc64/vectors.S Tue Oct 5 10:52:49 2010 (r887) @@ -557,8 +557,9 @@ SAVE_CPU_STATE(dtlb) - /* Switch to TLB locked stack space */ - add %g1, -STACK_BIAS, %sp + /* Switch to TLB locked stack space (note we add an additional 192 bytes required for + gcc to save its arguments when building with -O0) */ + add %g1, -STACK_BIAS - 192, %sp /* Enable interrupts for window spill/fill traps */ rdpr %pstate, %g7 @@ -581,8 +582,9 @@ SAVE_CPU_STATE(itlb) - /* Switch to TLB locked stack space */ - add %g1, -STACK_BIAS, %sp + /* Switch to TLB locked stack space (note we add an additional 192 bytes required for + gcc to save its arguments when building with -O0) */ + add %g1, -STACK_BIAS - 192, %sp /* Enable interrupts for window spill/fill traps */ rdpr %pstate, %g7

1 0

[commit] r879 - in trunk/openbios-devel/config: examples scripts
by repository service Oct. 3, 2010

Oct. 3, 2010

Author: blueswirl Date: Sun Oct 3 16:23:18 2010 New Revision: 879 URL: http://tracker.coreboot.org/trac/openbios/changeset/879 Log: Improve compile system Autodetect cross compilation, so cross- prefix is no longer needed. Unify cross and native configurations. Add unix- prefix to enable openbios-unix build for selected target, similarly builtin- for builtin targets etc. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Deleted: trunk/openbios-devel/config/examples/cross-ppc_config.xml trunk/openbios-devel/config/examples/cross-sparc32_config.xml trunk/openbios-devel/config/examples/cross-sparc64_config.xml trunk/openbios-devel/config/examples/cross-x86_config.xml Modified: trunk/openbios-devel/config/examples/amd64_config.xml trunk/openbios-devel/config/examples/ppc_config.xml trunk/openbios-devel/config/examples/sparc32_config.xml trunk/openbios-devel/config/examples/sparc64_config.xml trunk/openbios-devel/config/examples/x86_config.xml trunk/openbios-devel/config/scripts/switch-arch Modified: trunk/openbios-devel/config/examples/amd64_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/amd64_config.xml Sun Oct 3 12:34:50 2010 (r878) +++ trunk/openbios-devel/config/examples/amd64_config.xml Sun Oct 3 16:23:18 2010 (r879) @@ -1,20 +1,6 @@ -<?xml version="1.0"?> -<config> - -  - <option name="CONFIG_AMD64" type="boolean" value="true"/> - <option name="CONFIG_LITTLE_ENDIAN" type="boolean" value="true"/> -  - <option name="CONFIG_IMAGE_ELF" type="boolean" value="true"/> - <option name="CONFIG_IMAGE_ELF_EMBEDDED" type="boolean" value="true"/> <option name="CONFIG_IMAGE_ELF_MULTIBOOT" type="boolean" value="true"/> -  - <option name="CONFIG_HOST_UNIX" type="boolean" value="true"/> - <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> - <option name="CONFIG_PLUGINS" type="boolean" value="false"/> -  <option name="CONFIG_DEBUG" type="boolean" value="true"/> <option name="CONFIG_DEBUG_BOOT" type="boolean" value="true"/> @@ -72,5 +58,3 @@ <option name="CONFIG_DRIVER_IDE" type="boolean" value="true"/> <option name="CONFIG_IDE_NUM_CHANNELS" type="integer" value="4"/> <option name="CONFIG_DEBUG_IDE" type="boolean" value="false"/> - -</config> Modified: trunk/openbios-devel/config/examples/ppc_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/ppc_config.xml Sun Oct 3 12:34:50 2010 (r878) +++ trunk/openbios-devel/config/examples/ppc_config.xml Sun Oct 3 16:23:18 2010 (r879) @@ -1,19 +1,3 @@ -<?xml version="1.0"?> -<config> - -  - <option name="CONFIG_PPC" type="boolean" value="true"/> - <option name="CONFIG_MOL" type="boolean" value="false"/> - <option name="CONFIG_BRIQ" type="boolean" value="false"/> - <option name="CONFIG_PEARPC" type="boolean" value="false"/> - <option name="CONFIG_QEMU" type="boolean" value="true"/> - <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/> - -  - <option name="CONFIG_HOST_UNIX" type="boolean" value="false"/> - <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> - <option name="CONFIG_PLUGINS" type="boolean" value="false"/> -  <option name="CONFIG_DEBUG" type="boolean" value="true"/> <option name="CONFIG_DEBUG_BOOT" type="boolean" value="false"/> @@ -90,4 +74,3 @@ <option name="CONFIG_DRIVER_ESCC" type="boolean" value="true"/> <option name="CONFIG_DRIVER_FW_CFG" type="boolean" value="true"/> <option name="CONFIG_FW_CFG_ADDR" type="integer" value="0xf0000510"/> -</config> Modified: trunk/openbios-devel/config/examples/sparc32_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/sparc32_config.xml Sun Oct 3 12:34:50 2010 (r878) +++ trunk/openbios-devel/config/examples/sparc32_config.xml Sun Oct 3 16:23:18 2010 (r879) @@ -1,21 +1,6 @@ -<?xml version="1.0"?> -<config> - -  - <option name="CONFIG_SPARC" type="boolean" value="true"/> - <option name="CONFIG_SPARC32" type="boolean" value="true"/> - <option name="CONFIG_BIG_ENDIAN" type="boolean" value="true"/> -  - <option name="CONFIG_IMAGE_ELF" type="boolean" value="false"/> - <option name="CONFIG_IMAGE_ELF_EMBEDDED" type="boolean" value="true"/> <option name="CONFIG_IMAGE_ELF_MULTIBOOT" type="boolean" value="true"/> -  - <option name="CONFIG_HOST_UNIX" type="boolean" value="true"/> - <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> - <option name="CONFIG_PLUGINS" type="boolean" value="false"/> -  <option name="CONFIG_DEBUG" type="boolean" value="true"/> <option name="CONFIG_DEBUG_BOOT" type="boolean" value="false"/> @@ -84,4 +69,3 @@ <option name="CONFIG_DRIVER_ESCC_SUN" type="boolean" value="true"/> <option name="CONFIG_DRIVER_FW_CFG" type="boolean" value="true"/> <option name="CONFIG_FW_CFG_ADDR" type="integer" value="0xd00000510ULL"/> -</config> Modified: trunk/openbios-devel/config/examples/sparc64_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/sparc64_config.xml Sun Oct 3 12:34:50 2010 (r878) +++ trunk/openbios-devel/config/examples/sparc64_config.xml Sun Oct 3 16:23:18 2010 (r879) @@ -1,22 +1,6 @@ -<?xml version="1.0"?> -<config> - -  - <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"/> -  - <option name="CONFIG_IMAGE_ELF" type="boolean" value="false"/> - <option name="CONFIG_IMAGE_ELF_EMBEDDED" type="boolean" value="true"/> <option name="CONFIG_IMAGE_ELF_MULTIBOOT" type="boolean" value="true"/> -  - <option name="CONFIG_HOST_UNIX" type="boolean" value="true"/> - <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> - <option name="CONFIG_PLUGINS" type="boolean" value="false"/> -  <option name="CONFIG_DEBUG" type="boolean" value="true"/> <option name="CONFIG_DEBUG_BOOT" type="boolean" value="false"/> @@ -88,4 +72,3 @@ <option name="CONFIG_DRIVER_PC_SERIAL" type="boolean" value="true"/> <option name="CONFIG_DRIVER_FW_CFG" type="boolean" value="true"/> <option name="CONFIG_FW_CFG_ADDR" type="integer" value="0x510"/> -</config> Modified: trunk/openbios-devel/config/examples/x86_config.xml ============================================================================== --- trunk/openbios-devel/config/examples/x86_config.xml Sun Oct 3 12:34:50 2010 (r878) +++ trunk/openbios-devel/config/examples/x86_config.xml Sun Oct 3 16:23:18 2010 (r879) @@ -1,21 +1,6 @@ -<?xml version="1.0"?> -<config> - -  - <option name="CONFIG_X86" type="boolean" value="true"/> - <option name="CONFIG_LITTLE_ENDIAN" type="boolean" value="true"/> - <option name="CONFIG_XBOX" type="boolean" value="false"/> -  - <option name="CONFIG_IMAGE_ELF" type="boolean" value="true"/> - <option name="CONFIG_IMAGE_ELF_EMBEDDED" type="boolean" value="true"/> <option name="CONFIG_IMAGE_ELF_MULTIBOOT" type="boolean" value="true"/> -  - <option name="CONFIG_HOST_UNIX" type="boolean" value="true"/> - <option name="CONFIG_UNIX_QT" type="boolean" value="false"/> - <option name="CONFIG_PLUGINS" type="boolean" value="false"/> -  <option name="CONFIG_DEBUG" type="boolean" value="true"/> <option name="CONFIG_DEBUG_BOOT" type="boolean" value="true"/> @@ -76,5 +61,3 @@ <option name="CONFIG_DRIVER_VGA" type="boolean" value="true"/> <option name="CONFIG_DRIVER_FLOPPY" type="boolean" value="false"/> <option name="CONFIG_DEBUG_FLOPPY" type="boolean" value="false"/> - -</config> Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Sun Oct 3 12:34:50 2010 (r878) +++ trunk/openbios-devel/config/scripts/switch-arch Sun Oct 3 16:23:18 2010 (r879) @@ -5,12 +5,15 @@ # MOLPATH=$HOME/mol-0.9.71 -if [ x"$1" = x ]; then +if [ x"$1" = x -o "$1" = "-help" ]; then printf "Usage:\n $0 [arch-config]...\n" - printf "arch-config values supported for native builds:\n" - printf " amd64, ppc, sparc32, sparc64, x86\n" - printf "arch-config values supported for cross compiled builds:\n" - printf " cross-ppc, cross-sparc32, cross-sparc64, cross-x86\n" + printf "arch-config values supported for native or cross compiled builds:\n" + printf " amd64, ppc, sparc32, sparc64, x86\n\n" + printf "Add \"unix-\" prefix to compile openbios-unix executable (native only)\n" + printf "Add \"builtin-\" prefix to compile openbios-builtin executables\n\n" + printf "Without prefixes, builtin and unix targets are selected\n\n" + printf "Special targets: mol-ppc briq-ppc pearpc-ppc qemu-ppc xbox-x86\n\n" + printf "Example: $0 builtin-sparc32 unix-amd64 builtin-amd64\n" exit 0 fi @@ -102,6 +105,12 @@ exit 1 } +config_set_boolean() +{ + option=`echo $1 | tr a-z A-Z` + echo "<option name=\"$option\" type=\"boolean\" value=\"true\" />" +} + if ! test -f utils/dist/debian/rules; then echo "switch-arch must be run from the top-level source directory" >&2 exit 1 @@ -119,13 +128,93 @@ VERSION=`head VERSION` echo "Configuring OpenBIOS on $HOSTARCH for $*" -for RULES_ARCH in $*; do - if ! test -f config/examples/${RULES_ARCH}_config.xml; then - echo "Cannot find config/examples/${RULES_ARCH}_config.xml" >&2 - exit 1 + +target_list="" +for target in $*; do + case $target in + unix-*|builtin-*|plain-*|mol-ppc|briq-ppc|pearpc-ppc|qemu-ppc|xbox-x86) + target_list="$target_list $target" + ;; + cross-*) + echo "\"cross-\" prefix is no longer needed" + target=`echo $target | sed s/cross-//g` + target_list="$target_list builtin-$target" + ;; + *) + #default: build builtin and if possible, unix target + target_list="$target_list builtin-$target unix-$target" + ;; + esac +done + +arch_list="" +for target in $target_list; do + arch=`echo $target | sed s/.*-//g` + if ! test -f config/examples/${arch}_config.xml; then + echo "Cannot find config/examples/${arch}_config.xml" >&2 + exit 1 + fi + if ! echo $arch_list | grep -q "$arch"; then + arch_list="$arch_list $arch" fi +done + +for ARCH in $arch_list; do + unix="no" + builtin="no" + plain="no" + mol="no" + briq="no" + pearpc="no" + qemu="no" + xbox="no" + cross="no" + + for target in $target_list; do + case $target in + *-$ARCH) + : + ;; + *) + continue + ;; + esac + case $target in + mol-ppc) + mol="yes" + ;; + briq-ppc) + briq="yes" + ;; + pearpc-ppc) + pearpc="yes" + ;; + builtin-ppc|qemu-ppc) + qemu="yes" + ;; + xbox-x86) + xbox="yes" + ;; + builtin-sparc64) + builtin="yes" + qemu="yes" + ;; + unix-*) + if [ "$ARCH" != "$HOSTARCH" ]; then + # Can't cross compile Unix target + continue + fi + unix="yes" + ;; + builtin-*) + builtin="yes" + ;; + plain-*) + plain="yes" + ;; + esac + done - ARCH=`echo $RULES_ARCH | sed s/cross-//g` case $ARCH in amd64) select_prefix x86_64 @@ -135,7 +224,11 @@ ppc) select_prefix powerpc - CFLAGS="-msoft-float -fno-builtin-bcopy -fno-builtin-log2" + if [ "$unix" = "no" ]; then + CFLAGS="-msoft-float -fno-builtin-bcopy -fno-builtin-log2" + else + CFLAGS="-fno-builtin" + fi AS_FLAGS= ;; @@ -157,11 +250,12 @@ AS_FLAGS="-Wa,-32" ;; esac - if test "$ARCH" = "$RULES_ARCH"; then - TARGET="" + if [ "$ARCH" != "$HOSTARCH" ]; then + cross="yes" fi crosscflags $HOSTARCH $ARCH OBJDIR=obj-$ARCH + printf "Initializing build tree $OBJDIR..." rm -rf "$OBJDIR" mkdir "$OBJDIR" @@ -170,13 +264,6 @@ mkdir -p $OBJDIR/target/arch mkdir -p $OBJDIR/target/arch/unix mkdir -p $OBJDIR/target/arch/$ARCH - mkdir -p $OBJDIR/target/arch/ppc - mkdir -p $OBJDIR/target/arch/ppc/briq # no autodetection of those.. - mkdir -p $OBJDIR/target/arch/ppc/pearpc - mkdir -p $OBJDIR/target/arch/ppc/qemu - mkdir -p $OBJDIR/target/arch/ppc/mol - mkdir -p $OBJDIR/target/arch/x86 - mkdir -p $OBJDIR/target/arch/x86/xbox mkdir -p $OBJDIR/target/libgcc mkdir -p $OBJDIR/target/kernel mkdir -p $OBJDIR/target/libopenbios @@ -195,6 +282,31 @@ ln -s ../../../include/arch/$ARCH $OBJDIR/target/include/asm #compile the host binary with target settings instead #ln -s ../../../include/arch/$HOSTARCH $OBJDIR/host/include/asm + if [ "$mol" = "yes" ]; then + printf "\nUsing MOL path $MOLPATH...\n" + mkdir -p $OBJDIR/target/arch/ppc/mol + ln -s $MOLPATH/src/shared/osi_calls.h $OBJDIR/target/include/ + ln -s $MOLPATH/src/shared/osi.h $OBJDIR/target/include/ + ln -s $MOLPATH/src/shared/prom.h $OBJDIR/target/include/ + ln -s $MOLPATH/src/include/boothelper_sh.h $OBJDIR/target/include/ + ln -s $MOLPATH/src/include/video_sh.h $OBJDIR/target/include/ + ln -s $MOLPATH/src/include/pseudofs_sh.h $OBJDIR/target/include/ + ln -s $MOLPATH/src/include/kbd_sh.h $OBJDIR/target/include/ + ln -s $MOLPATH/src/drivers/disk/include/scsi_sh.h $OBJDIR/target/include/ + ln -s $MOLPATH/src/drivers/disk/include/ablk_sh.h $OBJDIR/target/include/ + fi + if [ "$briq" = "yes" ]; then + mkdir -p $OBJDIR/target/arch/ppc/briq + fi + if [ "$pearpc" = "yes" ]; then + mkdir -p $OBJDIR/target/arch/ppc/pearpc + fi + if [ "$qemu" = "yes" ]; then + mkdir -p $OBJDIR/target/arch/ppc/qemu + fi + if [ "$xbox" = "yes" ]; then + mkdir -p $OBJDIR/target/arch/x86/xbox + fi echo "ok." cd $OBJDIR @@ -203,35 +315,64 @@ printf "Creating target Makefile..." echo "ARCH=$ARCH" > $ODIR/config.mak - echo "TARGET=$TARGET" >> $ODIR/config.mak + if [ "$cross" = "yes" ]; then + echo "TARGET=$TARGET" >> $ODIR/config.mak + fi echo "CFLAGS=$CFLAGS" >> $ODIR/config.mak echo "AS_FLAGS=$AS_FLAGS" >> $ODIR/config.mak echo "HOSTARCH?=$HOSTARCH" >> $ODIR/config.mak echo "CROSSCFLAGS=$CROSSCFLAGS" >> $ODIR/config.mak echo "VERSION=\"$VERSION\"" >> $ODIR/config.mak + ln -s $SRCDIR/config/xml/rules.xml $ODIR/rules.xml - ln -s $SRCDIR/config/examples/${RULES_ARCH}_config.xml $ODIR/config.xml + echo "<?xml version=\"1.0\"?><config>" > $ODIR/config.xml + # Generic + config_set_boolean CONFIG_$ARCH >> $ODIR/config.xml + if [ "$mol" = "yes" ]; then + config_set_boolean CONFIG_MOL >> $ODIR/config.xml + fi + if [ "$briq" = "yes" ]; then + config_set_boolean CONFIG_BRIQ >> $ODIR/config.xml + fi + if [ "$pearpc" = "yes" ]; then + config_set_boolean CONFIG_PEARPC >> $ODIR/config.xml + fi + if [ "$qemu" = "yes" ]; then + config_set_boolean CONFIG_QEMU >> $ODIR/config.xml + fi + if [ "$xbox" = "yes" ]; then + config_set_boolean CONFIG_XBOX >> $ODIR/config.xml + fi + if [ "$targetbigendian" = "yes" ]; then + config_set_boolean CONFIG_BIG_ENDIAN >> $ODIR/config.xml + else + config_set_boolean CONFIG_LITTLE_ENDIAN >> $ODIR/config.xml + fi + # Kernel binaries + if [ "$plain" = "yes" ]; then + config_set_boolean CONFIG_IMAGE_ELF >> $ODIR/config.xml + fi + if [ "$builtin" = "yes" ]; then + config_set_boolean CONFIG_IMAGE_ELF_EMBEDDED >> $ODIR/config.xml + fi + # Build hosted Unix binary? + if [ "$unix" = "yes" ]; then + config_set_boolean CONFIG_HOST_UNIX >> $ODIR/config.xml + #config_set_boolean CONFIG_UNIX_QT >> $ODIR/config.xml + #config_set_boolean CONFIG_PLUGINS >> $ODIR/config.xml + fi + cat $SRCDIR/config/examples/${ARCH}_config.xml >> $ODIR/config.xml + + echo "</config>" >> $ODIR/config.xml ln -s ../Makefile.target $ODIR/Makefile xsltproc $SRCDIR/config/xml/xinclude.xsl $SRCDIR/build.xml > $ODIR/build-full.xml xsltproc $SRCDIR/config/xml/makefile.xsl $ODIR/build-full.xml > $ODIR/rules.mak echo "ok." printf "Creating config files..." - xsltproc $SRCDIR/config/xml/config-c.xsl $SRCDIR/config/examples/${RULES_ARCH}_config.xml > $ODIR/host/include/autoconf.h - xsltproc $SRCDIR/config/xml/config-c.xsl $SRCDIR/config/examples/${RULES_ARCH}_config.xml > $ODIR/target/include/autoconf.h - xsltproc $SRCDIR/config/xml/config-forth.xsl $SRCDIR/config/examples/${RULES_ARCH}_config.xml > $ODIR/forth/config.fs + xsltproc $SRCDIR/config/xml/config-c.xsl $ODIR/config.xml > $ODIR/host/include/autoconf.h + xsltproc $SRCDIR/config/xml/config-c.xsl $ODIR/config.xml > $ODIR/target/include/autoconf.h + xsltproc $SRCDIR/config/xml/config-forth.xsl $ODIR/config.xml > $ODIR/forth/config.fs echo "ok." - grep CONFIG_MOL $ODIR/forth/config.fs >/dev/null && ( \ - echo "Using MOL path $MOLPATH..."; \ - ln -s $MOLPATH/src/shared/osi_calls.h $ODIR/target/include/; \ - ln -s $MOLPATH/src/shared/osi.h $ODIR/target/include/; \ - ln -s $MOLPATH/src/shared/prom.h $ODIR/target/include/; \ - ln -s $MOLPATH/src/include/boothelper_sh.h $ODIR/target/include/; \ - ln -s $MOLPATH/src/include/video_sh.h $ODIR/target/include/; \ - ln -s $MOLPATH/src/include/pseudofs_sh.h $ODIR/target/include/; \ - ln -s $MOLPATH/src/include/kbd_sh.h $ODIR/target/include/; \ - ln -s $MOLPATH/src/drivers/disk/include/scsi_sh.h $ODIR/target/include/; \ - ln -s $MOLPATH/src/drivers/disk/include/ablk_sh.h $ODIR/target/include/ ) || true - cd $SRCDIR done

3 9

[commit] r886 - trunk/openbios-devel/arch/sparc64
by repository service Oct. 3, 2010

Oct. 3, 2010

Author: mcayland Date: Sun Oct 3 22:28:27 2010 New Revision: 886 URL: http://tracker.coreboot.org/trac/openbios/changeset/886 Log: Implement va>tte-data defer word for the MMU TLB miss handlers. As used by OpenSolaris. This enables OpenSolaris boot to proceed further by allowing the kernel to correctly manage its own TLB misses. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)siriusit.co.uk> Modified: trunk/openbios-devel/arch/sparc64/init.fs trunk/openbios-devel/arch/sparc64/lib.c Modified: trunk/openbios-devel/arch/sparc64/init.fs ============================================================================== --- trunk/openbios-devel/arch/sparc64/init.fs Sun Oct 3 21:18:28 2010 (r885) +++ trunk/openbios-devel/arch/sparc64/init.fs Sun Oct 3 22:28:27 2010 (r886) @@ -1,3 +1,10 @@ +\ va>tte-data defer MMU virtual to physical address hook for Solaris +\ We need to make sure this is in the global wordlist +active-package 0 active-package! +defer va>tte-data +0 to va>tte-data +active-package! + :noname ." Type 'help' for detailed information" cr \ ." boot secondary slave cdrom: " cr Modified: trunk/openbios-devel/arch/sparc64/lib.c ============================================================================== --- trunk/openbios-devel/arch/sparc64/lib.c Sun Oct 3 21:18:28 2010 (r885) +++ trunk/openbios-devel/arch/sparc64/lib.c Sun Oct 3 22:28:27 2010 (r886) @@ -16,6 +16,8 @@ #include "ofmem_sparc64.h" +static ucell *va2ttedata = 0; + /* Format a string and print it on the screen, just like the libc * function printf. */ @@ -228,10 +230,28 @@ faultva >>= 13; faultva <<= 13; - /* Search the ofmem linked list for this virtual address */ - PUSH(faultva); - pgmap_fetch(); - tte_data = POP(); + /* If a valid va>tte-data routine has been set, invoke that Forth xt instead */ + if (va2ttedata && *va2ttedata != 0) { + + /* va>tte-data ( addr cnum -- false | tte-data true ) */ + PUSH(faultva); + PUSH(0); + enterforth(*va2ttedata); + + /* Check the result first... */ + tte_data = POP(); + if (!tte_data) { + bug(); + } else { + /* Grab the real data */ + tte_data = POP(); + } + } else { + /* Search the ofmem linked list for this virtual address */ + PUSH(faultva); + pgmap_fetch(); + tte_data = POP(); + } if (tte_data) { /* Update MMU */ @@ -240,6 +260,7 @@ /* If we got here, there was no translation so fail */ bug(); } + } static void @@ -298,10 +319,28 @@ faultva >>= 13; faultva <<= 13; - /* Search the ofmem linked list for this virtual address */ - PUSH(faultva); - pgmap_fetch(); - tte_data = POP(); + /* If a valid va>tte-data routine has been set, invoke that Forth xt instead */ + if (va2ttedata && *va2ttedata != 0) { + + /* va>tte-data ( addr cnum -- false | tte-data true ) */ + PUSH(faultva); + PUSH(0); + enterforth(*va2ttedata); + + /* Check the result first... */ + tte_data = POP(); + if (!tte_data) { + bug(); + } else { + /* Grab the real data */ + tte_data = POP(); + } + } else { + /* Search the ofmem linked list for this virtual address */ + PUSH(faultva); + pgmap_fetch(); + tte_data = POP(); + } if (tte_data) { /* Update MMU */ @@ -617,4 +656,8 @@ PUSH(0); fword("active-package!"); bind_func("pgmap@", pgmap_fetch); + + /* Find address of va2ttedata defer word contents for MMU miss handlers */ + va2ttedata = (ucell *)findword("va>tte-data"); + va2ttedata++; }

1 0

[commit] r884 - in trunk/openbios-devel/fs: hfs iso9660
by repository service Oct. 3, 2010

Oct. 3, 2010

Author: blueswirl Date: Sun Oct 3 21:18:26 2010 New Revision: 884 URL: http://tracker.coreboot.org/trac/openbios/changeset/884 Log: ppc: fix warnings from GCC 4.6.0 Compiling PPC with GCC 4.6.0 20100925 produced a few warnings: ../fs/hfs/block.c: In function 'reuse': ../fs/hfs/block.c:304:11: error: variable 'chain' set but not used [-Werror=unused-but-set-variable] ../fs/iso9660/iso9660_mount.c: In function 'iso9660_name': ../fs/iso9660/iso9660_mount.c:18:16: error: variable 'uh' set but not used [-Werror=unused-but-set-variable] Fix the warnings by avoiding write-only variables. Signed-off-by: Blue Swirl <blauwirbel(a)gmail.com> Modified: trunk/openbios-devel/fs/hfs/block.c trunk/openbios-devel/fs/iso9660/iso9660_mount.c Modified: trunk/openbios-devel/fs/hfs/block.c ============================================================================== --- trunk/openbios-devel/fs/hfs/block.c Sun Oct 3 21:18:23 2010 (r883) +++ trunk/openbios-devel/fs/hfs/block.c Sun Oct 3 21:18:26 2010 (r884) @@ -301,7 +301,7 @@ static int reuse(bcache *cache, bucket *b, unsigned long bnum) { - bucket *chain[HFS_BLOCKBUFSZ], *bptr; + bucket *bptr; int i; # ifdef DEBUG @@ -317,7 +317,6 @@ for (bptr = b, i = 0; i < HFS_BLOCKBUFSZ; ++i) { - chain[i] = bptr; bptr = bptr->cprev; } } Modified: trunk/openbios-devel/fs/iso9660/iso9660_mount.c ============================================================================== --- trunk/openbios-devel/fs/iso9660/iso9660_mount.c Sun Oct 3 21:18:23 2010 (r883) +++ trunk/openbios-devel/fs/iso9660/iso9660_mount.c Sun Oct 3 21:18:26 2010 (r884) @@ -15,7 +15,7 @@ void iso9660_name(iso9660_VOLUME *volume, struct iso_directory_record *idr, char *buffer) { int j; - unsigned char uh, ul, uc; + unsigned char ul, uc; buffer[0] = 0; if (idr->name_len[0] == 1 && idr->name[0] == 0) @@ -32,7 +32,6 @@ */ for (j = 0; j < (int)idr->name_len[0] / 2; j++) { - uh = idr->name[j*2]; ul = idr->name[j*2+1]; /*

1 0