OpenBIOS April 2015

openbios@openbios.org

10 participants
28 discussions

[PATCH] Add non-standard compiler prefix support
by Programmingkid 10 May '15

10 May '15

This patch gives OpenBIOS users the ability to specify their own compiler prefix. It can be used by just adding PREFIX=<your prefix> right before the switch-arch command. Example: PREFIX=ppc-elf- ./switch-arch ppc Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: config/scripts/switch-arch =================================================================== --- config/scripts/switch-arch (revision 1335) +++ config/scripts/switch-arch (working copy) @@ -99,6 +99,13 @@ select_prefix() { + # if the user specified the prefix like this: PREFIX=ppc-elf- ./switch-arch ppc + if [ $PREFIX ] + then + TARGET=$PREFIX + return + fi + for TARGET in ${1}-unknown-linux-gnu- ${1}-linux-gnu- ${1}-linux- ${1}-elf- ${1}-eabi- do if type ${TARGET}gcc > /dev/null 2>&1

4 11

[Patch v3] Add non-standard compiler prefix support
by Programmingkid 30 Apr '15

30 Apr '15

This version of the patch just fixes up the comment to sound better. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: config/scripts/switch-arch =================================================================== --- config/scripts/switch-arch (revision 1335) +++ config/scripts/switch-arch (working copy) @@ -99,7 +99,8 @@ select_prefix() { - for TARGET in ${1}-unknown-linux-gnu- ${1}-linux-gnu- ${1}-linux- ${1}-elf- ${1}-eabi- + # The user can specify the cross compiler like this: CROSS_COMPILER=ppc-elf- ./switch-arch ppc + for TARGET in ${1}-unknown-linux-gnu- ${1}-linux-gnu- ${1}-linux- ${1}-elf- ${1}-eabi- $CROSS_COMPILER do if type ${TARGET}gcc > /dev/null 2>&1 then

3 6

[Patch v4] Add non-standard compiler prefix support
by Programmingkid 30 Apr '15

30 Apr '15

This version of the patch reduces the for loop and comments' line length. It also has the loop test the CROSS_COMPILER variable first making things a little more efficient. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: config/scripts/switch-arch =================================================================== --- config/scripts/switch-arch (revision 1335) +++ config/scripts/switch-arch (working copy) @@ -99,7 +99,10 @@ select_prefix() { - for TARGET in ${1}-unknown-linux-gnu- ${1}-linux-gnu- ${1}-linux- ${1}-elf- ${1}-eabi- + # The user can specify the cross compiler like this: + # CROSS_COMPILER=ppc-elf- ./switch-arch ppc + for TARGET in $CROSS_COMPILER ${1}-unknown-linux-gnu- ${1}-linux-gnu- \ + ${1}-linux- ${1}-elf- ${1}-eabi- do if type ${TARGET}gcc > /dev/null 2>&1 then

1 0

[Patch v2] Add non-standard compiler prefix support
by Programmingkid 30 Apr '15

30 Apr '15

This simplifies the patch even more. The $PREFIX variable has been changed to $CROSS_COMPILER. It is much more intuitive this way. Thank you Lennart for the suggestion. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: config/scripts/switch-arch =================================================================== --- config/scripts/switch-arch (revision 1335) +++ config/scripts/switch-arch (working copy) @@ -99,7 +99,8 @@ select_prefix() { - for TARGET in ${1}-unknown-linux-gnu- ${1}-linux-gnu- ${1}-linux- ${1}-elf- ${1}-eabi- + # if the user specified the cross compiler like this: CROSS_COMPILER=ppc-elf- ./switch-arch ppc + for TARGET in ${1}-unknown-linux-gnu- ${1}-linux-gnu- ${1}-linux- ${1}-elf- ${1}-eabi- $CROSS_COMPILER do if type ${TARGET}gcc > /dev/null 2>&1 then

1 0

[PATCH] Fixes printk so it prints very large strings
by Programmingkid 28 Apr '15

28 Apr '15

Fixes printk function so it can print very large strings. This patch does allow me to see the full bootscript in the serial console. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: arch/ppc/qemu/qemu.c =================================================================== --- arch/ppc/qemu/qemu.c (revision 1335) +++ arch/ppc/qemu/qemu.c (working copy) @@ -56,7 +56,7 @@ int printk( const char *fmt, ... ) { - char *p, buf[1024]; + char *p, buf[10024]; va_list args; int i;

2 2

milliseconds isn't unique
by Alexander Graf 28 Apr '15

28 Apr '15

Hi Mark, Does this ring a bell with you? I'm getting the error below with latest QEMU+KVM on a G5. Alex 2015-04-15 23:54:36: C>> annot manage 'ethernet controller' PCI device type 'network': 2015-04-15 23:54:36: >> 8086 100e (2 0 0) 2015-04-15 23:54:36: 2015-04-15 23:54:36: >> ============================================================= 2015-04-15 23:54:36: >> OpenBIOS 1.1 [Mar 12 2015 08:09] 2015-04-15 23:54:36: >> Configuration device id QEMU version 1 machine id 1 2015-04-15 23:54:36: >> CPUs: 1 2015-04-15 23:54:36: >> Memory: 512M 2015-04-15 23:54:36: >> UUID: 00000000-0000-0000-0000-000000000000 2015-04-15 23:54:36: >> CPU type PowerPC,G4 2015-04-15 23:54:36: milliseconds isn't unique. 2015-04-16 00:06:57: (Process terminated with status 0)

3 8

[commit] r1335 - in trunk/fcode-utils-devel: detok romheaders toke
by repository service 26 Apr '15

26 Apr '15

Author: mcayland Date: Sun Apr 26 21:49:15 2015 New Revision: 1335 URL: http://tracker.coreboot.org/trac/openbios/changeset/1335 Log: fcode-utils: add Makefile install target Add an install target to the fcode-utils Makefiles for toke, detok and romheaders so that "make install" will work correctly. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Reviewed-by: Andreas Färber <afaerber(a)suse.de> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> Modified: trunk/fcode-utils-devel/detok/Makefile trunk/fcode-utils-devel/romheaders/Makefile trunk/fcode-utils-devel/toke/Makefile Modified: trunk/fcode-utils-devel/detok/Makefile ============================================================================== --- trunk/fcode-utils-devel/detok/Makefile Wed Mar 11 23:58:20 2015 (r1334) +++ trunk/fcode-utils-devel/detok/Makefile Sun Apr 26 21:49:15 2015 (r1335) @@ -24,6 +24,7 @@ PROGRAM = detok +DESTDIR = /usr/local CC ?= gcc STRIP = strip INCLUDES = -I../shared @@ -63,3 +64,6 @@ .c.o: $(CC) -c $(CFLAGS) $(INCLUDES) $< -o $@ +install: + mkdir -p $(DESTDIR)/bin + cp $(PROGRAM) $(DESTDIR)/bin/$(PROGRAM) Modified: trunk/fcode-utils-devel/romheaders/Makefile ============================================================================== --- trunk/fcode-utils-devel/romheaders/Makefile Wed Mar 11 23:58:20 2015 (r1334) +++ trunk/fcode-utils-devel/romheaders/Makefile Sun Apr 26 21:49:15 2015 (r1335) @@ -22,6 +22,9 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA # +PROGRAM = romheaders + +DESTDIR = /usr/local CC ?= gcc STRIP = strip CFLAGS = -O2 -Wall -Wextra @@ -39,4 +42,8 @@ clean: rm -f *~ - rm -f romheaders + rm -f $(PROGRAM) + +install: + mkdir -p $(DESTDIR)/bin + cp $(PROGRAM) $(DESTDIR)/bin/$(PROGRAM) Modified: trunk/fcode-utils-devel/toke/Makefile ============================================================================== --- trunk/fcode-utils-devel/toke/Makefile Wed Mar 11 23:58:20 2015 (r1334) +++ trunk/fcode-utils-devel/toke/Makefile Sun Apr 26 21:49:15 2015 (r1335) @@ -24,6 +24,7 @@ PROGRAM = toke +DESTDIR = /usr/local CC ?= gcc STRIP = strip INCLUDES = -I../shared @@ -73,3 +74,6 @@ .c.o: $(CC) -c $(CFLAGS) $(INCLUDES) $< -o $@ +install: + mkdir -p $(DESTDIR)/bin + cp $(PROGRAM) $(DESTDIR)/bin/$(PROGRAM)

1 0

[PATCH] fcode-utils: add Makefile install target
by Mark Cave-Ayland 26 Apr '15

26 Apr '15

Add an install target to the fcode-utils Makefiles for toke, detok and romheaders so that "make install" will work correctly. Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Signed-off-by: Mark Cave-Ayland <mark.cave-ayland(a)ilande.co.uk> --- fcode-utils-devel/detok/Makefile | 4 ++++ fcode-utils-devel/romheaders/Makefile | 9 ++++++++- fcode-utils-devel/toke/Makefile | 4 ++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/fcode-utils-devel/detok/Makefile b/fcode-utils-devel/detok/Makefile index 0b730dc..3ba6c30 100644 --- a/fcode-utils-devel/detok/Makefile +++ b/fcode-utils-devel/detok/Makefile @@ -24,6 +24,7 @@ PROGRAM = detok +DESTDIR = /usr/local CC ?= gcc STRIP = strip INCLUDES = -I../shared @@ -63,3 +64,6 @@ clean: .c.o: $(CC) -c $(CFLAGS) $(INCLUDES) $< -o $@ +install: + mkdir -p $(DESTDIR)/bin + cp $(PROGRAM) $(DESTDIR)/bin/$(PROGRAM) diff --git a/fcode-utils-devel/romheaders/Makefile b/fcode-utils-devel/romheaders/Makefile index 7d47a21..a216e7b 100644 --- a/fcode-utils-devel/romheaders/Makefile +++ b/fcode-utils-devel/romheaders/Makefile @@ -22,6 +22,9 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA # +PROGRAM = romheaders + +DESTDIR = /usr/local CC ?= gcc STRIP = strip CFLAGS = -O2 -Wall -Wextra @@ -39,4 +42,8 @@ romheaders: $(SOURCES) clean: rm -f *~ - rm -f romheaders + rm -f $(PROGRAM) + +install: + mkdir -p $(DESTDIR)/bin + cp $(PROGRAM) $(DESTDIR)/bin/$(PROGRAM) diff --git a/fcode-utils-devel/toke/Makefile b/fcode-utils-devel/toke/Makefile index a3d81b1..aa75acd 100644 --- a/fcode-utils-devel/toke/Makefile +++ b/fcode-utils-devel/toke/Makefile @@ -24,6 +24,7 @@ PROGRAM = toke +DESTDIR = /usr/local CC ?= gcc STRIP = strip INCLUDES = -I../shared @@ -73,3 +74,6 @@ documentation:: *.c *.h toke.doxygen .c.o: $(CC) -c $(CFLAGS) $(INCLUDES) $< -o $@ +install: + mkdir -p $(DESTDIR)/bin + cp $(PROGRAM) $(DESTDIR)/bin/$(PROGRAM) -- 1.7.10.4

3 3

[PATCH v2] gives the fcode-utils an install target
by Programmingkid 26 Apr '15

26 Apr '15

This patch gives the fcode-utils' toke, detok, and romheaders commands an install target. This makes "make install" work. Changes since v1: - Added DESTDIR variable Signed-off-by: John Arbuckle <programmingkidx(a)gmail.com> Index: detok/Makefile =================================================================== --- detok/Makefile (revision 1334) +++ detok/Makefile (working copy) @@ -23,7 +23,7 @@ # PROGRAM = detok - +DESTDIR=/usr/local/bin CC ?= gcc STRIP = strip INCLUDES = -I../shared @@ -63,3 +63,5 @@ .c.o: $(CC) -c $(CFLAGS) $(INCLUDES) $< -o $@ +install: + cp $(PROGRAM) $(DESTDIR)/$(PROGRAM) Index: romheaders/Makefile =================================================================== --- romheaders/Makefile (revision 1334) +++ romheaders/Makefile (working copy) @@ -22,6 +22,8 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA # +PROGRAM=romheaders +DESTDIR=/usr/local/bin CC ?= gcc STRIP = strip CFLAGS = -O2 -Wall -Wextra @@ -39,4 +41,7 @@ clean: rm -f *~ - rm -f romheaders + rm -f $(PROGRAM) + +install: + cp $(PROGRAM) $(DESTDIR)/$(PROGRAM) Index: toke/Makefile =================================================================== --- toke/Makefile (revision 1334) +++ toke/Makefile (working copy) @@ -23,7 +23,7 @@ # PROGRAM = toke - +DESTDIR=/usr/local/bin CC ?= gcc STRIP = strip INCLUDES = -I../shared @@ -73,3 +73,5 @@ .c.o: $(CC) -c $(CFLAGS) $(INCLUDES) $< -o $@ +install: + cp $(PROGRAM) $(DESTDIR)/$(PROGRAM)

3 4

[PATCH] init: add Adler-32 checksum support
by Cormac O'Brien 20 Apr '15

20 Apr '15

From: Cormac O'Brien <cormac(a)c-obrien.org> --- arch/ppc/qemu/init.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/arch/ppc/qemu/init.c b/arch/ppc/qemu/init.c index 4fe8b72..f9989ed 100644 --- a/arch/ppc/qemu/init.c +++ b/arch/ppc/qemu/init.c @@ -680,6 +680,57 @@ static void ffilll(void) } } +/* adler32 (len buf adler -- checksum) + * + * Adapted from Mark Adler's zlib implementation */ + +#define DO1(buf,i) {s1 += buf[i]; s2 += s1;} +#define DO2(buf,i) DO1(buf,i); DO1(buf,i+1); +#define DO4(buf,i) DO2(buf,i); DO2(buf,i+2); +#define DO8(buf,i) DO4(buf,i); DO4(buf,i+4); +#define DO16(buf) DO8(buf,0); DO8(buf,8); + +static void adler32(void) +{ + uint32_t len = POP(); + char *buf = POP(); + uint32_t adler = POP(); + + if (buf == NULL) { + RET(-1); + } + + uint32_t base = 65521; + uint32_t nmax = 5552; + + uint32_t s1 = adler & 0xffff; + uint32_t s2 = (adler >> 16) & 0xffff; + + uint32_t k; + while (len > 0) { + k = (len < nmax ? len : nmax); + len -= k; + + while (k >= 16) { + DO16(buf); + buf += 16; + k -= 16; + } + + if (k != 0) { + do { + s1 += *buf++; + s2 += s1; + } while (--k); + } + + s1 %= base; + s2 %= base; + } + + RET(s2 << 16 | s1); +} + void arch_of_init(void) { @@ -945,6 +996,9 @@ arch_of_init(void) /* Implementation of filll word (required by BootX) */ bind_func("filll", ffilll); + + /* Implementation of Adler-32 required by Mac OS 9 */ + bind_func("adler32", adler32); bind_func("platform-boot", boot); bind_func("(go)", go); -- 2.3.5

4 5