openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r2132 - forth/wrapper
by repository service 20 Jan '11

20 Jan '11

Author: wmb Date: Thu Jan 20 02:12:45 2011 New Revision: 2132 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2132 Log: Initial revision of null implementation of ZIP routines for wrapper. Added: forth/wrapper/nullzip.c Added: forth/wrapper/nullzip.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ forth/wrapper/nullzip.c Thu Jan 20 02:12:45 2011 (r2132) @@ -0,0 +1,11 @@ +/* + * Stub versions of zip_memory() and inflate() for organizations + * immune to the license of the code that implementes zip_memory() + */ +zip_memory() +{ +} + +inflate() +{ +}

1 0

[commit] r2131 - cpu/arm/olpc/1.75
by repository service 20 Jan '11

20 Jan '11

Author: wmb Date: Thu Jan 20 01:39:30 2011 New Revision: 2131 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2131 Log: Eliminated the need for the md5sum command (not present on Mac OS) in the sd8686.bth script. Modified: cpu/arm/olpc/1.75/sd8686.bth Modified: cpu/arm/olpc/1.75/sd8686.bth ============================================================================== --- cpu/arm/olpc/1.75/sd8686.bth Thu Jan 20 01:04:21 2011 (r2130) +++ cpu/arm/olpc/1.75/sd8686.bth Thu Jan 20 01:39:30 2011 (r2131) @@ -3,6 +3,24 @@ command: &builder &this build-now +char * value prefix +\needs $md5digest1 fload ${BP}/ofw/ppp/md5.fth +: $md5sum-file ( filename$ -- ) + 2dup $read-file ( filename$ adr len ) + 2dup $md5digest1 ( filename$ adr len md5$ ) + 2swap free-mem ( filename$ md5$ ) + " md5string" $new-file ( filename$ md5$ ) + bounds ?do ( filename$ ) + i c@ push-hex <# u# u# u#> ofd @ fputs pop-base + loop ( filename$ ) + " " ofd @ fputs ( filename$ ) + prefix ofd @ fputc ( filename$ ) + ofd @ fputs ( ) + fcr + ofd @ fclose +; + + fload ${BP}/cpu/arm/olpc/1.75/wlan-version.fth " macro: WLAN_FILE lbtf_sdio-${WLAN_VERSION}" expand$ eval @@ -14,15 +32,18 @@ " wget -q http://dev.laptop.org/pub/firmware/libertas/thinfirm/${WLAN_FILE}.bin" expand$ $sh " wget -q http://dev.laptop.org/pub/firmware/libertas/thinfirm/${WLAN_FILE}.bin.md5" expand$ $sh -" md5sum ${WLAN_FILE}.bin | cmp - ${WLAN_FILE}.bin.md5" expand$ $sh + +bl to prefix " ${WLAN_FILE}.bin" expand$ $md5sum-file +" cmp md5string ${WLAN_FILE}.bin.md5" expand$ $sh " mv ${WLAN_FILE}.bin sd8686.bin" expand$ $sh " wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686_helper.bin" expand$ $sh " wget -q http://dev.laptop.org/pub/firmware/libertas/sd8686_helper.bin.md5" expand$ $sh -" md5sum -b sd8686_helper.bin | cmp - sd8686_helper.bin.md5" expand$ $sh +char * to prefix " sd8686_helper.bin" $md5sum-file +" cmp md5string sd8686_helper.bin.md5" expand$ $sh -" rm ${WLAN_FILE}.bin.md5 sd8686_helper.bin.md5" expand$ $sh +" rm ${WLAN_FILE}.bin.md5 sd8686_helper.bin.md5 md5string" expand$ $sh [then] \ This forces the creation of a .log file, so we don't re-fetch

1 0

[commit] r2130 - cpu/x86/Darwin
by repository service 20 Jan '11

20 Jan '11

Author: wmb Date: Thu Jan 20 01:04:21 2011 New Revision: 2130 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2130 Log: Darwin/Makefile.armforth deleted, rules having been moved into Makefile Deleted: cpu/x86/Darwin/Makefile.armforth

1 0

[commit] r2129 - in cpu/x86: Darwin Linux
by repository service 20 Jan '11

20 Jan '11

Author: wmb Date: Thu Jan 20 01:01:07 2011 New Revision: 2129 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2129 Log: Makefile frobbing - use consistent brace type. Modified: cpu/x86/Darwin/Makefile cpu/x86/Linux/Makefile Modified: cpu/x86/Darwin/Makefile ============================================================================== --- cpu/x86/Darwin/Makefile Thu Jan 20 00:40:27 2011 (r2128) +++ cpu/x86/Darwin/Makefile Thu Jan 20 01:01:07 2011 (r2129) @@ -6,8 +6,8 @@ MFLAGS = -m32 OPT = -O -CFLAGS = -g $(MFLAGS) -DTARGET_X86 -LFLAGS = $(MFLAGS) +CFLAGS = -g ${MFLAGS} -DTARGET_X86 +LFLAGS = ${MFLAGS} # Extra CFLAGS needed by Darwin hosts. GCC doesn't define __unix__ here, # so we must include it ourselves. @@ -49,7 +49,7 @@ # Use x86forth when you need to compile new dictionaries that will # run on x86 systems. forth: ${OBJS} - ${CC} $(MFLAGS) -o $@ ${OBJS} + ${CC} ${MFLAGS} -o $@ ${OBJS} @ln -sf forth x86forth %.o: ${WRDIR}/%.c @@ -75,7 +75,7 @@ wrapsim.o: ${WRDIR}/wrapper.c ${CC} -c ${ARMCFLAGS} -c $< -o $@ -armsim.trace.o: $(ARMDIR)/armsim.c +armsim.trace.o: ${ARMDIR}/armsim.c ${CC} -c ${ARMCFLAGS} -DTRACE=1 -c $< -o $@ armforth: ${ARMSIMOBJS} Modified: cpu/x86/Linux/Makefile ============================================================================== --- cpu/x86/Linux/Makefile Thu Jan 20 00:40:27 2011 (r2128) +++ cpu/x86/Linux/Makefile Thu Jan 20 01:01:07 2011 (r2129) @@ -6,8 +6,8 @@ MFLAGS = -m32 OPT = -O -CFLAGS = -g $(MFLAGS) -DTARGET_X86 -LFLAGS = $(MFLAGS) +CFLAGS = -g ${MFLAGS} -DTARGET_X86 +LFLAGS = ${MFLAGS} # Uncomment these lines to include X windows support to the wrapper # via libxcb. The libxcb development package (headers, etc) must be @@ -44,7 +44,7 @@ @ln -sf forth x86forth inflate.lo: ${ZIPDIR}/inflate.c - ${CC} -c $(MFLAGS) -Wall -fno-stack-protector -ffreestanding -D_FORTIFY_SOURCE=0 -DNEED_BCOPY -O3 -fpic $< -o $@ + ${CC} -c ${MFLAGS} -Wall -fno-stack-protector -ffreestanding -D_FORTIFY_SOURCE=0 -DNEED_BCOPY -O3 -fpic $< -o $@ inflate.o: inflate.lo ${LD} -melf_i386 -T inflate.ld $< -o $@ @@ -71,14 +71,14 @@ wrapsim.o: ${WRDIR}/wrapper.c ${CC} -c ${ARMCFLAGS} -c $< -o $@ -armsim.trace.o: $(ARMDIR)/armsim.c +armsim.trace.o: ${ARMDIR}/armsim.c ${CC} -c ${ARMCFLAGS} -DTRACE=1 -c $< -o $@ armforth: ${ARMSIMOBJS} - ${CC} ${ARMSIMOBJS} -o $@ + ${CC} ${LFLAGS} ${ARMSIMOBJS} -o $@ armforth.trace: ${ARMTRACEOBJS} - ${CC} ${ARMTRACEOBJS} -o $@ + ${CC} ${LFLAGS} ${ARMTRACEOBJS} -o $@ clean: @rm -f forth x86forth armforth *.o *~ inflate.bin

1 0

[commit] r2128 - cpu/x86/Darwin
by repository service 20 Jan '11

20 Jan '11

Author: wmb Date: Thu Jan 20 00:40:27 2011 New Revision: 2128 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2128 Log: Fixed LFLAGS problem in Darwin Makefile. Modified: cpu/x86/Darwin/Makefile Modified: cpu/x86/Darwin/Makefile ============================================================================== --- cpu/x86/Darwin/Makefile Thu Jan 20 00:32:43 2011 (r2127) +++ cpu/x86/Darwin/Makefile Thu Jan 20 00:40:27 2011 (r2128) @@ -79,10 +79,10 @@ ${CC} -c ${ARMCFLAGS} -DTRACE=1 -c $< -o $@ armforth: ${ARMSIMOBJS} - ${CC} ${ARMSIMOBJS} -o $@ + ${CC} ${LFLAGS} ${ARMSIMOBJS} -o $@ armforth.trace: ${ARMTRACEOBJS} - ${CC} ${ARMTRACEOBJS} -o $@ + ${CC} ${LFLAGS} ${ARMTRACEOBJS} -o $@ clean: @rm -f forth x86forth armforth *.o *~ inflate.bin

1 0

[commit] r2127 - in cpu: arm/openmoko/build x86/Darwin x86/Linux
by repository service 20 Jan '11

20 Jan '11

Author: wmb Date: Thu Jan 20 00:32:43 2011 New Revision: 2127 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2127 Log: Makefile frobbing to make the Darwin Makefile correspond to the Linux Makefile. Modified: cpu/arm/openmoko/build/Makefile cpu/x86/Darwin/Makefile cpu/x86/Linux/Makefile Modified: cpu/arm/openmoko/build/Makefile ============================================================================== --- cpu/arm/openmoko/build/Makefile Thu Jan 20 00:28:37 2011 (r2126) +++ cpu/arm/openmoko/build/Makefile Thu Jan 20 00:32:43 2011 (r2127) @@ -18,12 +18,15 @@ tags: ${ROMNAME}.tag @${BASEDIR}/forth/lib/toctags ${BASEDIR} ${TAGFILES} -${ROMNAME}.rom: FORCE build ${CLIENTPROGS} ${HOSTDIR}/forth +${ROMNAME}.rom: FORCE build ${CLIENTPROGS} ${HOSTDIR}/forth ${HOSTDIR}/armforth ./build $@ ${HOSTDIR}/forth: @make -C ${HOSTDIR} forth +${HOSTDIR}/armforth: + @make -C ${HOSTDIR} armforth + ../../build/inflate.bin: @make -C ../../build inflate.bin Modified: cpu/x86/Darwin/Makefile ============================================================================== --- cpu/x86/Darwin/Makefile Thu Jan 20 00:28:37 2011 (r2126) +++ cpu/x86/Darwin/Makefile Thu Jan 20 00:32:43 2011 (r2127) @@ -2,67 +2,87 @@ BP=../../.. -CFLAGS = -g -m32 -DTARGET_X86 +# Flags for the OS and CPU +MFLAGS = -m32 + +OPT = -O +CFLAGS = -g $(MFLAGS) -DTARGET_X86 +LFLAGS = $(MFLAGS) # Extra CFLAGS needed by Darwin hosts. GCC doesn't define __unix__ here, # so we must include it ourselves. CFLAGS += -D__unix__=1 -Wimplicit-function-declaration -#CFLAGS += -DUSE_XCB +SIMCFLAGS += -D__unix__=1 -Wimplicit-function-declaration WRTAIL = forth/wrapper WRDIR = ${BP}/${WRTAIL} + +ifdef OMIT_ZIP +ZIPDIR = ${WRDIR} +ZIPOBJS = nullzip.o +INFLATEBIN = +else ZIPTAIL = ${WRTAIL}/zip ZIPDIR = ${BP}/${ZIPTAIL} -# Apple's GCC is a bit brain-dead. It's probably best to install gcc43 and -# binutils from macports. See http://macports.macforge.net for how to install -# and use macports. At the very least, binutils from macports seems to be -# required. - -# The default compiler on Mac OS X (as of 10.5 anyway) does not honor -fpic. -# GCC will warn about -fpic not being supported, assumes you meant -fPIC, -# and switches to that. That should be okay, but if you're concerned about it -# I'm providing this already defined override for ${CC}. To use it, just -# uncomment it, or pass CC= on the command line. This is here to make things -# easier for us lazy people. -#CC = /opt/local/bin/gcc-mp-4.3 - -# Unfortunately, Mac OS X does not ship with objcopy. This means that one must -# install binutils from macports, so we override the OBJCOPY variable here -# and just use that instead of calling 'objcopy' itself. -OBJCOPY = /opt/local/bin/gobjcopy - ZIPOBJS = zipmem.o deflate.o trees.o bits.o util.o inflate.o - -OBJS = wrapper.o logger.o ${ZIPOBJS} - -all: forth x86forth ../build/inflate.bin - -# Use forth when you just need to run Forth but don't care what -# native instruction set it is on. -# Use x86forth when you need to compile new dictionaries that will -# run on x86 systems. -forth: ${OBJS} - ${CC} -m32 -o $@ ${OBJS} - @ln -sf forth x86forth +INFLATEBIN = ../../build/inflate.bin # Compile with -O0 because with GCC4, higher optimization levels cause the # functions to be reordered so the "inflate" entry point is no longer at # the beginning. inflate.o: ${ZIPDIR}/inflate.c - ${CC} -c -m32 -O0 -fpic $< -o $@ + ${CC} -c ${MFLAGS} -O0 -fpic $< -o $@ # Well, we're not going to get objcopy in a generic OS X environment, so # let's just fake it. ../build/inflate.bin: inflate.o - # ${OBJCOPY} -O binary $< $@ dd if=$< of=$@ bs=256 skip=1 +endif + +OBJS = wrapper.o logger.o ${ZIPOBJS} + +all: forth x86forth ${INFLATEBIN} + +# Use forth when you just need to run Forth but don't care what +# native instruction set it is on. +# Use x86forth when you need to compile new dictionaries that will +# run on x86 systems. +forth: ${OBJS} + ${CC} $(MFLAGS) -o $@ ${OBJS} + @ln -sf forth x86forth %.o: ${WRDIR}/%.c - ${CC} -c ${CFLAGS} -I${ZIPDIR} $< -o $@ + ${CC} -c ${OPT} ${CFLAGS} $< -o $@ %.o: ${ZIPDIR}/%.c - ${CC} -c ${CFLAGS} -I${ZIPDIR} $< -o $@ + ${CC} -c ${OPT} ${CFLAGS} -I${ZIPDIR} $< -o $@ + +# ARM simulator wrapper build rules + +ARMDIR = ${BP}/cpu/arm +ARMCFLAGS = -g ${MFLAGS} -DARMSIM -DTARGET_ARM -DARM -DSIMNEXT +ARMSIMOBJS = wrapsim.o armsim.o logger.o ${ZIPOBJS} +ARMTRACEOBJS = wrapsim.o armsim.trace.o logger.o ${ZIPOBJS} + +# Extra CFLAGS needed by Darwin hosts. GCC doesn't define __unix__ here, +# so we must include it ourselves. +ARMCFLAGS += -D__unix__=1 -Wimplicit-function-declaration + +%.o: ${ARMDIR}/%.c + ${CC} -c ${ARMCFLAGS} $< -o $@ + +wrapsim.o: ${WRDIR}/wrapper.c + ${CC} -c ${ARMCFLAGS} -c $< -o $@ + +armsim.trace.o: $(ARMDIR)/armsim.c + ${CC} -c ${ARMCFLAGS} -DTRACE=1 -c $< -o $@ + +armforth: ${ARMSIMOBJS} + ${CC} ${ARMSIMOBJS} -o $@ + +armforth.trace: ${ARMTRACEOBJS} + ${CC} ${ARMTRACEOBJS} -o $@ clean: - @rm -f forth x86forth *.o *~ inflate.bin + @rm -f forth x86forth armforth *.o *~ inflate.bin Modified: cpu/x86/Linux/Makefile ============================================================================== --- cpu/x86/Linux/Makefile Thu Jan 20 00:28:37 2011 (r2126) +++ cpu/x86/Linux/Makefile Thu Jan 20 00:32:43 2011 (r2127) @@ -2,7 +2,12 @@ BP=../../.. -CFLAGS = -O -g -m32 -DTARGET_X86 +# Flags for the OS and CPU +MFLAGS = -m32 + +OPT = -O +CFLAGS = -g $(MFLAGS) -DTARGET_X86 +LFLAGS = $(MFLAGS) # Uncomment these lines to include X windows support to the wrapper # via libxcb. The libxcb development package (headers, etc) must be @@ -13,11 +18,19 @@ WRTAIL = forth/wrapper WRDIR = ${BP}/${WRTAIL} + +ifdef OMIT_ZIP +ZIPDIR = ${WRDIR} +ZIPOBJS = nullzip.o +INFLATEBIN = +else ZIPTAIL = ${WRTAIL}/zip ZIPDIR = ${BP}/${ZIPTAIL} ZIPOBJS = zipmem.o deflate.o trees.o bits.o util.o inflate.o +endif + OBJS += wrapper.o logger.o ${ZIPOBJS} all: forth x86forth ../build/inflate.bin @@ -27,11 +40,11 @@ # Use x86forth when you need to compile new dictionaries that will # run on x86 systems. forth: ${OBJS} - ${CC} -m32 -o $@ ${OBJS} ${LIBS} + ${CC} ${MFLAGS} -o $@ ${OBJS} ${LIBS} @ln -sf forth x86forth inflate.lo: ${ZIPDIR}/inflate.c - ${CC} -c -m32 -Wall -fno-stack-protector -ffreestanding -D_FORTIFY_SOURCE=0 -DNEED_BCOPY -O3 -fpic $< -o $@ + ${CC} -c $(MFLAGS) -Wall -fno-stack-protector -ffreestanding -D_FORTIFY_SOURCE=0 -DNEED_BCOPY -O3 -fpic $< -o $@ inflate.o: inflate.lo ${LD} -melf_i386 -T inflate.ld $< -o $@ @@ -40,15 +53,15 @@ objcopy -O binary $< $@ %.o: ${WRDIR}/%.c - ${CC} -c ${CFLAGS} $< -o $@ + ${CC} -c ${OPT} ${CFLAGS} $< -o $@ %.o: ${ZIPDIR}/%.c - ${CC} -c ${CFLAGS} -I${ZIPDIR} $< -o $@ + ${CC} -c ${OPT} ${CFLAGS} -I${ZIPDIR} $< -o $@ # ARM simulator wrapper build rules ARMDIR = ${BP}/cpu/arm -ARMCFLAGS = -g -m32 -DARMSIM -DTARGET_ARM -DARM -DSIMNEXT +ARMCFLAGS = -g ${MFLAGS} -DARMSIM -DTARGET_ARM -DARM -DSIMNEXT ARMSIMOBJS = wrapsim.o armsim.o logger.o ${ZIPOBJS} ARMTRACEOBJS = wrapsim.o armsim.trace.o logger.o ${ZIPOBJS}

1 0

[commit] r2126 - forth/wrapper
by repository service 20 Jan '11

20 Jan '11

Author: wmb Date: Thu Jan 20 00:28:37 2011 New Revision: 2126 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2126 Log: Mostly-cosmetic changes to the wrapper. You can turn on simulator sign-on chattiness by defining VERBOSE. Modified: forth/wrapper/wrapper.c Modified: forth/wrapper/wrapper.c ============================================================================== --- forth/wrapper/wrapper.c Thu Jan 20 00:26:40 2011 (r2125) +++ forth/wrapper/wrapper.c Thu Jan 20 00:28:37 2011 (r2126) @@ -347,11 +347,11 @@ INTERNAL long f_crstr(); #if defined(PPCSIM) || defined (ARMSIM) - /* These are not INTERNAL because the PowerPC simulator uses then */ - long c_key(); - long s_bye(); - void simulate(); - void restoremode(); + /* These are not INTERNAL because the simulators use then */ + long c_key(); + long s_bye(); + void simulate(); + void restoremode(); #else INTERNAL long c_key(); INTERNAL long s_bye(); @@ -1002,9 +1002,15 @@ dictsize = sizeof(header) + imagesize + extrasize ; dictsize += 16; /* Allow for alignment */ -# ifdef PPCSIM +# ifdef VERBOSE +# ifdef PPCSIM printf("PowerPC Instruction Set Simulator\n"); printf("Copyright 1994 FirmWorks All rights reserved\n"); +# elif ARMSIM + printf("ARM Instruction Set Simulator\n"); + printf("Copyright 1994 FirmWorks All rights reserved\n"); + printf("Copyright 2010 Apple, Inc. All rights reserved\n"); +# endif # endif loadaddr = (char *)m_alloc(dictsize); @@ -1063,7 +1069,6 @@ loadaddr, functions, ((long)loadaddr+dictsize - 16) & ~15, argc, argv, 1 /* 0=POWER, 1=PowerPC */); #elif defined(ARMSIM) - // printf("loadaddr = 0x%x\n",loadaddr); simulate(0L, loadaddr, loadaddr, functions, ((long)loadaddr+dictsize - 16) & ~15, argc, argv); #else

1 0

[commit] r2125 - forth/lib
by repository service 20 Jan '11

20 Jan '11

Author: wmb Date: Thu Jan 20 00:26:40 2011 New Revision: 2125 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2125 Log: Added "x86" to CPU type recognizer script (alternative i*86) Modified: forth/lib/hostcpu.sh Modified: forth/lib/hostcpu.sh ============================================================================== --- forth/lib/hostcpu.sh Thu Jan 20 00:25:52 2011 (r2124) +++ forth/lib/hostcpu.sh Thu Jan 20 00:26:40 2011 (r2125) @@ -4,6 +4,7 @@ sun4*) CPUNAME=sparc ;; ppc) CPUNAME=powerpc ;; i*86) CPUNAME=x86 ;; + x86*) CPUNAME=x86 ;; mips) CPUNAME=mips ;; arm*) CPUNAME=arm ;; sun3) CPUNAME=m68k ;;

1 0

[commit] r2124 - forth/kernel
by repository service 20 Jan '11

20 Jan '11

Author: wmb Date: Thu Jan 20 00:25:52 2011 New Revision: 2124 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2124 Log: Added fixme: directive to kernel. Modified: forth/kernel/kernel.fth Modified: forth/kernel/kernel.fth ============================================================================== --- forth/kernel/kernel.fth Thu Jan 20 00:25:34 2011 (r2123) +++ forth/kernel/kernel.fth Thu Jan 20 00:25:52 2011 (r2124) @@ -3082,6 +3082,7 @@ : command: [compile] \ ; : in: [compile] \ ; : dictionary: [compile] \ ; +: fixme: ." FIXME: " -1 parse type cr ; \ From cmdline.fth

1 0

[commit] r2123 - forth/lib
by repository service 20 Jan '11

20 Jan '11

Author: wmb Date: Thu Jan 20 00:25:34 2011 New Revision: 2123 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2123 Log: Added fixme: directive to builder. Modified: forth/lib/builder.fth Modified: forth/lib/builder.fth ============================================================================== --- forth/lib/builder.fth Wed Jan 19 23:48:49 2011 (r2122) +++ forth/lib/builder.fth Thu Jan 20 00:25:34 2011 (r2123) @@ -500,6 +500,9 @@ \ : debug-in: ['] in: (debug ; +: fixme: ." FIXME: " -1 parse type cr ; + + previous definitions \ LICENSE_BEGIN \ Copyright (c) 2006 FirmWorks

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware