OpenBIOS November 2015

openbios@openbios.org

9 participants
16 discussions

[commit] r1358 - in trunk/openbios-devel: . include/arch/ppc
by repository service 06 Nov '15

06 Nov '15

Author: mcayland Date: Fri Nov 6 16:06:36 2015 New Revision: 1358 URL: http://tracker.coreboot.org/trac/openbios/changeset/1358 Log: bootstrap: don't include files from target/include as system includes Replace "-I" by "-iquote" to only take files from this directory when '#include "..."' is used ('#include <...>' works as usual). We need this because on powerpc64 asm/sigcontext.h includes <asm/elf.h> and tries to include target/include/asm/elf.h instead of /usr/include/asm/elf.h. We also remove from include/arch/ppc/types/h some useless and conflicting type definitions. Signed-off-by: Laurent Vivier <laurent(a)vivier.eu> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/Makefile.target trunk/openbios-devel/include/arch/ppc/types.h Modified: trunk/openbios-devel/Makefile.target ============================================================================== --- trunk/openbios-devel/Makefile.target Fri Nov 6 16:06:33 2015 (r1357) +++ trunk/openbios-devel/Makefile.target Fri Nov 6 16:06:36 2015 (r1358) @@ -15,7 +15,7 @@ HOSTCFLAGS+= -W # Flags for dependency generation HOSTCFLAGS+= -MMD -MP -MT $@ -MF '$(*D)/$(*F).d' -HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -I$(ODIR)/target/include +HOSTINCLUDES := -I$(SRCDIR)/include -I$(SRCDIR)/kernel -I$(SRCDIR)/kernel/include -iquote $(ODIR)/target/include CC := $(TARGET)gcc AS := $(TARGET)as Modified: trunk/openbios-devel/include/arch/ppc/types.h ============================================================================== --- trunk/openbios-devel/include/arch/ppc/types.h Fri Nov 6 16:06:33 2015 (r1357) +++ trunk/openbios-devel/include/arch/ppc/types.h Fri Nov 6 16:06:36 2015 (r1358) @@ -84,21 +84,13 @@ /* size named types */ typedef unsigned char u8; -typedef unsigned char __u8; typedef unsigned short u16; -typedef unsigned short __u16; typedef unsigned int u32; -typedef unsigned int __u32; typedef unsigned long long u64; -typedef unsigned long long __u64; typedef signed char s8; -typedef signed char __s8; typedef short s16; -typedef short __s16; typedef int s32; -typedef int __s32; typedef long long s64; -typedef long long __s64; #endif

1 0

[commit] r1357 - trunk/openbios-devel/config/scripts
by repository service 06 Nov '15

06 Nov '15

Author: mcayland Date: Fri Nov 6 16:06:33 2015 New Revision: 1357 URL: http://tracker.coreboot.org/trac/openbios/changeset/1357 Log: switch-arch: as for powerpc64, select sparc64 compiler to compile sparc32 As for powerpc64, only sparc64 compiler is available in the distro (Fedora 22), so use it if is available. The change is the same one as introduced for powerpc64. Signed-off-by: Laurent Vivier <laurent(a)vivier.eu> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/config/scripts/switch-arch Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Fri Nov 6 16:06:31 2015 (r1356) +++ trunk/openbios-devel/config/scripts/switch-arch Fri Nov 6 16:06:33 2015 (r1357) @@ -280,7 +280,7 @@ ;; sparc32) - select_prefix sparc + select_prefix sparc sparc64 CFLAGS="-Wa,-xarch=v8 -Wa,-32 -m32 -mcpu=supersparc -fno-builtin" AS_FLAGS="-Wa,-xarch=v8 -Wa,-32" ;;

1 0

[commit] r1356 - trunk/openbios-devel/config/scripts
by repository service 06 Nov '15

06 Nov '15

Author: mcayland Date: Fri Nov 6 16:06:31 2015 New Revision: 1356 URL: http://tracker.coreboot.org/trac/openbios/changeset/1356 Log: switch-arch: compute base arch and allow native compiler for 32bit and 64bit Signed-off-by: Laurent Vivier <laurent(a)vivier.eu> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/config/scripts/switch-arch Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Fri Nov 6 16:06:27 2015 (r1355) +++ trunk/openbios-devel/config/scripts/switch-arch Fri Nov 6 16:06:31 2015 (r1356) @@ -45,6 +45,19 @@ fi } +basearch() +{ + arch=$1 + case $arch in + powerpc|ppc64|powerpc64) + echo ppc + ;; + *) + echo $arch + ;; + esac +} + crosscflags() { host=$1 @@ -95,6 +108,7 @@ select_prefix() { + BASEARCH=$(basearch $ARCH) for target_arch ; do TARGETS="${target_arch}-unknown-linux-gnu- ${target_arch}-linux-gnu- ${target_arch}-linux- ${target_arch}-elf- ${target_arch}-eabi-" @@ -109,7 +123,8 @@ return fi done - if [ "$ARCH" = "$HOSTARCH" ]; then + if [ "$BASEARCH" = "$(basearch $HOSTARCH)" ]; then + TARGET="" return fi done @@ -240,7 +255,6 @@ esac done - BASEARCH=$ARCH case $ARCH in amd64) select_prefix x86_64 @@ -263,7 +277,6 @@ select_prefix powerpc64 CFLAGS="-Wa,-a64 -m64 -msoft-float -fno-builtin" AS_FLAGS="-Wa,-a64" - BASEARCH=ppc ;; sparc32)

1 0

[commit] r1355 - trunk/openbios-devel/config/scripts
by repository service 06 Nov '15

06 Nov '15

Author: mcayland Date: Fri Nov 6 16:06:27 2015 New Revision: 1355 URL: http://tracker.coreboot.org/trac/openbios/changeset/1355 Log: switch-arch: factorize code to compute architecture properties. Put in two functions code that computes if given architecture is big endian or not, and the size of long (32bit or 64bit). Signed-off-by: Laurent Vivier <laurent(a)vivier.eu> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/openbios-devel/config/scripts/switch-arch Modified: trunk/openbios-devel/config/scripts/switch-arch ============================================================================== --- trunk/openbios-devel/config/scripts/switch-arch Fri Nov 6 16:06:25 2015 (r1354) +++ trunk/openbios-devel/config/scripts/switch-arch Fri Nov 6 16:06:27 2015 (r1355) @@ -17,48 +17,44 @@ exit 0 fi -crosscflags() +is_bigendian() { - host=$1 - target=$2 + cpu=$1 - if test "$host" = "powerpc" -o "$host" = "ppc" \ - -o "$host" = "mips" -o "$host" = "s390" \ - -o "$host" = "sparc32" -o "$host" = "sparc64" \ - -o "$host" = "m68k" -o "$host" = "armv4b"; then - hostbigendian="yes" + if test "$cpu" = "powerpc" -o "$cpu" = "ppc" \ + -o "$cpu" = "powerpc64" -o "$cpu" = "ppc64" \ + -o "$cpu" = "mips" -o "$cpu" = "s390" \ + -o "$cpu" = "sparc32" -o "$cpu" = "sparc64" \ + -o "$cpu" = "m68k" -o "$cpu" = "armv4b"; then + echo yes else - hostbigendian="no" + echo no fi +} -# host long bits test - if test "$host" = "sparc64" -o "$host" = "ia64" \ - -o "$host" = "amd64" -o "$host" = "x86_64" \ - -o "$host" = "alpha"; then - hostlongbits="64" +longbits() +{ + cpu=$1 + if test "$cpu" = "sparc64" -o "$cpu" = "ia64" \ + -o "$cpu" = "amd64" -o "$cpu" = "x86_64" \ + -o "$cpu" = "powerpc64" -o "$cpu" = "ppc64" \ + -o "$cpu" = "alpha"; then + echo 64 else - hostlongbits="32" + echo 32 fi +} - if test "$target" = "powerpc" -o "$target" = "ppc" \ - -o "$target" = "powerpc64" -o "$target" = "ppc64" \ - -o "$target" = "mips" -o "$target" = "s390" \ - -o "$target" = "sparc32" -o "$target" = "sparc64" \ - -o "$target" = "m68k" -o "$target" = "armv4b"; then - targetbigendian="yes" - else - targetbigendian="no" - fi +crosscflags() +{ + host=$1 + target=$2 -# target long bits test - if test "$target" = "sparc64" -o "$target" = "ia64" \ - -o "$target" = "amd64" -o "$target" = "x86_64" \ - -o "$target" = "powerpc64" -o "$target" = "ppc64" \ - -o "$target" = "alpha"; then - targetlongbits="64" - else - targetlongbits="32" - fi + hostbigendian=$(is_bigendian $host) + hostlongbits=$(longbits $host) + + targetbigendian=$(is_bigendian $target) + targetlongbits=$(longbits $target) if test "$targetbigendian" = "$hostbigendian"; then cflags="-USWAP_ENDIANNESS"

1 0

[commit] r1354 - trunk/fcode-utils-devel/toke
by repository service 06 Nov '15

06 Nov '15

Author: mcayland Date: Fri Nov 6 16:06:25 2015 New Revision: 1354 URL: http://tracker.coreboot.org/trac/openbios/changeset/1354 Log: toke: fix line parsing on big-endian Trying to compile openbios on Fedora 22 ppc64, I had the following error: toke -o QEMU,VGA.bin ~/openbios/drivers/vga.fs ... Tokenizing ~/openbios/drivers/vga.fs Binary output to QEMU,VGA.bin Warning: File ~/openbios/drivers/vga.fs, Line 1. Unterminated comment Nothing Tokenized. 1 Warning. This can be reproduced with the fcode-utils examples. "toke" is parsing the comment line until it finds a '\n'. The '\n' is stored as a char in a field of an union, but it is read as a long. It works well on little endian but not on big endian. Signed-off-by: Laurent Vivier <laurent(a)vivier.eu> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/fcode-utils-devel/toke/scanner.c Modified: trunk/fcode-utils-devel/toke/scanner.c ============================================================================== --- trunk/fcode-utils-devel/toke/scanner.c Fri Oct 23 14:58:22 2015 (r1353) +++ trunk/fcode-utils-devel/toke/scanner.c Fri Nov 6 16:06:25 2015 (r1354) @@ -1625,7 +1625,7 @@ void user_message( tic_param_t pfield ) { - char delim = (char)pfield.deflt_elem ; + char delim = (char)pfield.fw_token ; handle_user_message( delim, TRUE); } @@ -5295,7 +5295,7 @@ void process_remark( tic_param_t pfield ) { - char until_char = (char)pfield.deflt_elem ; + char until_char = (char)pfield.fw_token ; unsigned int start_lineno = lineno; #ifdef DEBUG_SCANNER

1 0

[PATCH fcode-utils] toke: fix line parsing on big-endian
by Laurent Vivier 02 Nov '15

02 Nov '15

Trying to compile openbios on Fedora 22 ppc64, I had the following error: toke -o QEMU,VGA.bin ~/openbios/drivers/vga.fs ... Tokenizing ~/openbios/drivers/vga.fs Binary output to QEMU,VGA.bin Warning: File ~/openbios/drivers/vga.fs, Line 1. Unterminated comment Nothing Tokenized. 1 Warning. This can be reproduced with the fcode-utils examples. "toke" is parsing the comment line until it finds a '\n'. The '\n' is stored as a char in a field of an union, but it is read as a long. It works well on little endian but not on big endian. Signed-off-by: Laurent Vivier <laurent(a)vivier.eu> --- diff -ru fcode-utils/toke/scanner.c fcode-utils-new/toke/scanner.c --- fcode-utils/toke/scanner.c 2006-10-30 09:48:28.000000000 +0100 +++ fcode-utils-new/toke/scanner.c 2015-10-19 00:21:43.417373690 +0200 @@ -1625,7 +1625,7 @@ void user_message( tic_param_t pfield ) { - char delim = (char)pfield.deflt_elem ; + char delim = (char)pfield.fw_token ; handle_user_message( delim, TRUE); } @@ -5295,7 +5295,7 @@ void process_remark( tic_param_t pfield ) { - char until_char = (char)pfield.deflt_elem ; + char until_char = (char)pfield.fw_token ; unsigned int start_lineno = lineno; #ifdef DEBUG_SCANNER

1 0