openfirmware

openfirmware@openfirmware.info

3007 discussions

[commit] r1938 - clients/memtest86
by repository service 17 Aug '10

17 Aug '10

Author: wmb Date: Tue Aug 17 21:10:51 2010 New Revision: 1938 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1938 Log: x86 - memtest86 - Fixed the problem cited in the previous commit in a different way, performing the overflow checks using integer arithmetic that is immune to pointer overflow optimizations, thus allowing the use of -Os again. The intention is that it should now work when compiled with either -O1 or -Os, with all versions of GCC. The change is consistent with the 4.0 version of memtest86 from memtest.org . (Also fixed some whitespace problems.) Modified: clients/memtest86/test.c Modified: clients/memtest86/test.c ============================================================================== --- clients/memtest86/test.c Tue Aug 17 19:22:56 2010 (r1937) +++ clients/memtest86/test.c Tue Aug 17 21:10:51 2010 (r1938) @@ -6,6 +6,7 @@ #include "test.h" #include "config.h" #include "ega.h" +#include <inttypes.h> extern int segs, bail; extern volatile ulong *p; @@ -35,12 +36,12 @@ /* Test the global address bits */ for (p1=0, j=0; j<2; j++) { - hprint(LINE_PAT, COL_PAT, p1); + hprint(LINE_PAT, COL_PAT, p1); /* Set pattern in our lowest multiple of 0x20000 */ p = (ulong *)roundup((ulong)v->map[0].start, 0x1ffff); *p = p1; - + /* Now write pattern compliment */ p1 = ~p1; end = v->map[segs-1].end; @@ -48,15 +49,15 @@ mask = 4; do { pt = (ulong *)((ulong)p | mask); - if (pt == p) { + if ((uintptr_t)pt == (uintptr_t)p) { mask = mask << 1; continue; } - if (pt >= end) { + if ((uintptr_t)pt >= (uintptr_t)end) { break; } *pt = p1; - if ((bad = *p) != ~p1) { + if ((uintptr_t)(bad = *p) != (uintptr_t)~p1) { ad_err1((ulong *)p, (ulong *)mask, bad, ~p1); i = 1000; @@ -77,14 +78,14 @@ bank = 0x40000; } for (p1=0, k=0; k<2; k++) { - hprint(LINE_PAT, COL_PAT, p1); + hprint(LINE_PAT, COL_PAT, p1); for (j=0; j<segs; j++) { p = v->map[j].start; /* Force start address to be a multiple of 256k */ p = (ulong *)roundup((ulong)p, bank - 1); end = v->map[j].end; - while (p < end) { + while ((uintptr_t)p < (uintptr_t)end) { *p = p1; p1 = ~p1; @@ -93,24 +94,24 @@ do { pt = (ulong *) ((ulong)p | mask); - if (pt == p) { + if ((uintptr_t)pt == (uintptr_t)p) { mask = mask << 1; continue; } - if (pt >= end) { + if ((uintptr_t)pt >= (uintptr_t)end) { break; } *pt = p1; - if ((bad = *p) != ~p1) { + if ((uintptr_t)(bad = *p) != (uintptr_t)~p1) { ad_err1((ulong *)p, - (ulong *)mask, - bad,~p1); + (ulong *)mask, + bad,~p1); i = 200; } mask = mask << 1; } while(mask); } - if (p + bank > p) { + if ((uintptr_t)(p + bank) > (uintptr_t)p) { p += bank; } else { p = end; @@ -133,7 +134,7 @@ volatile ulong *pe; volatile ulong *end, *start; - cprint(LINE_PAT, COL_PAT, " "); + cprint(LINE_PAT, COL_PAT, " "); /* Write each address with it's own address */ for (j=0; j<segs; j++) { @@ -144,16 +145,16 @@ done = 0; do { /* Check for overflow */ - if (pe + SPINSZ > pe) { + if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { pe += SPINSZ; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } @@ -188,16 +189,16 @@ done = 0; do { /* Check for overflow */ - if (pe + SPINSZ > pe) { + if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { pe += SPINSZ; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe ) { break; } /* Original C code replaced with hand tuned assembly code @@ -220,7 +221,7 @@ "cmpl %%edx,%%edi\n\t" "jb L91\n\t" "jmp L94\n\t" - + "L93:\n\t" "pushl %%edx\n\t" "pushl %%ecx\n\t" @@ -264,7 +265,7 @@ } /* Display the current seed */ - hprint(LINE_PAT, COL_PAT, seed1); + hprint(LINE_PAT, COL_PAT, seed1); rand_seed(seed1, seed2); for (j=0; j<segs; j++) { start = v->map[j].start; @@ -274,16 +275,16 @@ done = 0; do { /* Check for overflow */ - if (pe + SPINSZ > pe) { + if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { pe += SPINSZ; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } /* Original C code replaced with hand tuned assembly code */ @@ -293,19 +294,19 @@ } */ - asm __volatile__ ( - "jmp L200\n\t" - ".p2align 4,,7\n\t" - "L200:\n\t" - "call rand\n\t" + asm __volatile__ ( + "jmp L200\n\t" + ".p2align 4,,7\n\t" + "L200:\n\t" + "call rand\n\t" "movl %%eax,(%%edi)\n\t" - "addl $4,%%edi\n\t" - "cmpl %%ebx,%%edi\n\t" - "jb L200\n\t" - : "=D" (p) - : "D" (p), "b" (pe) + "addl $4,%%edi\n\t" + "cmpl %%ebx,%%edi\n\t" + "jb L200\n\t" + : "=D" (p) + : "D" (p), "b" (pe) : "eax" - ); + ); do_tick(); BAILR @@ -325,16 +326,16 @@ done = 0; do { /* Check for overflow */ - if (pe + SPINSZ > pe) { + if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { pe += SPINSZ; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } /* Original C code replaced with hand tuned assembly code */ @@ -410,7 +411,7 @@ volatile ulong *start,*end; /* Display the current pattern */ - hprint(LINE_PAT, COL_PAT, p1); + hprint(LINE_PAT, COL_PAT, p1); /* Initialize memory with the initial pattern. */ for (j=0; j<segs; j++) { @@ -421,17 +422,17 @@ done = 0; do { /* Check for overflow */ - if (pe + SPINSZ > pe) { + if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { pe += SPINSZ; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } len = pe - p; - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } /* Original C code replaced with hand tuned assembly code @@ -462,16 +463,16 @@ done = 0; do { /* Check for overflow */ - if (pe + SPINSZ > pe) { + if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { pe += SPINSZ; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } /* Original C code replaced with hand tuned assembly code @@ -528,16 +529,16 @@ done = 0; do { /* Check for underflow */ - if (pe - SPINSZ < pe) { + if ((uintptr_t)(pe - SPINSZ) < (uintptr_t)pe) { pe -= SPINSZ; } else { pe = start; } - if (pe <= start) { + if ((uintptr_t)pe <= (uintptr_t)start) { pe = start; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } /* Original C code replaced with hand tuned assembly code @@ -612,16 +613,16 @@ pat = p1; do { /* Check for overflow */ - if (pe + SPINSZ > pe) { + if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { pe += SPINSZ; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } /* Do a SPINSZ section of memory */ @@ -674,16 +675,16 @@ pat = p1; do { /* Check for overflow */ - if (pe + SPINSZ > pe) { + if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { pe += SPINSZ; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } /* Original C code replaced with hand tuned assembly code @@ -787,16 +788,16 @@ done = 0; do { /* Check for underflow */ - if (pe - SPINSZ < pe) { + if ((uintptr_t)(pe - SPINSZ) < (uintptr_t)pe) { pe -= SPINSZ; } else { pe = start; } - if (pe <= start) { + if ((uintptr_t)pe <= (uintptr_t)start) { pe = start; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } /* Original C code replaced with hand tuned assembly code @@ -882,9 +883,9 @@ volatile ulong *start, *end; /* Display the current pattern */ - hprint(LINE_PAT, COL_PAT-2, p1); + hprint(LINE_PAT, COL_PAT-2, p1); cprint(LINE_PAT, COL_PAT+6, "-"); - dprint(LINE_PAT, COL_PAT+7, offset, 2, 1); + dprint(LINE_PAT, COL_PAT+7, offset, 2, 1); /* Write every nth location with pattern */ for (j=0; j<segs; j++) { @@ -895,16 +896,16 @@ done = 0; do { /* Check for overflow */ - if (pe + SPINSZ > pe) { + if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { pe += SPINSZ; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } /* Original C code replaced with hand tuned assembly code @@ -940,16 +941,16 @@ k = 0; do { /* Check for overflow */ - if (pe + SPINSZ > pe) { + if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { pe += SPINSZ; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } /* Original C code replaced with hand tuned assembly code @@ -998,16 +999,16 @@ done = 0; do { /* Check for overflow */ - if (pe + SPINSZ > pe) { + if ((uintptr_t)(pe + SPINSZ) > (uintptr_t)pe) { pe += SPINSZ; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } /* Original C code replaced with hand tuned assembly code @@ -1052,11 +1053,11 @@ BAILR } while (!done); } - cprint(LINE_PAT, COL_PAT, " "); + cprint(LINE_PAT, COL_PAT, " "); } /* - * Test memory using block moves + * Test memory using block moves * Adapted from Robert Redelmeier's burnBX test */ void block_move(int iter) @@ -1066,7 +1067,7 @@ volatile ulong p, pe, pp; volatile ulong start, end; - cprint(LINE_PAT, COL_PAT-2, " "); + cprint(LINE_PAT, COL_PAT-2, " "); /* Initialize memory with the initial pattern. */ for (j=0; j<segs; j++) { @@ -1085,16 +1086,16 @@ done = 0; do { /* Check for overflow */ - if (pe + SPINSZ*4 > pe) { + if ((uintptr_t)(pe + SPINSZ*4) > (uintptr_t)pe) { pe += SPINSZ*4; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } len = ((ulong)pe - (ulong)p) / 64; @@ -1134,7 +1135,7 @@ } while (!done); } - /* Now move the data around + /* Now move the data around * First move the data up half of the segment size we are testing * Then move the data to the original location + 32 bytes */ @@ -1154,16 +1155,16 @@ done = 0; do { /* Check for overflow */ - if (pe + SPINSZ*4 > pe) { + if ((uintptr_t)(pe + SPINSZ*4) > (uintptr_t)pe) { pe += SPINSZ*4; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } pp = p + ((pe - p) / 2); @@ -1201,7 +1202,7 @@ } while (!done); } - /* Now check the data + /* Now check the data * The error checking is rather crude. We just check that the * adjacent words are the same. */ @@ -1221,16 +1222,16 @@ done = 0; do { /* Check for overflow */ - if (pe + SPINSZ*4 > pe) { + if ((uintptr_t)(pe + SPINSZ*4) > (uintptr_t)pe) { pe += SPINSZ*4; } else { pe = end; } - if (pe >= end) { + if ((uintptr_t)pe >= (uintptr_t)end) { pe = end; done++; } - if (p == pe ) { + if ((uintptr_t)p == (uintptr_t)pe) { break; } asm __volatile__ ( @@ -1296,7 +1297,7 @@ end = v->map[j].end; pe = start; p = start; - for (p=end; p<end; p++) { + for (p=start; p<end; p++) { *p = p1; } do_tick(); @@ -1311,8 +1312,8 @@ end = v->map[j].end; pe = start; p = start; - for (p=end; p<end; p++) { - if ((bad=*p) != p1) { + for (p=start; p<end; p++) { + if ((bad=*p) != p1) { error((ulong*)p, p1, bad); } }

1 0

[commit] r1937 - clients/memtest86
by repository service 17 Aug '10

17 Aug '10

Author: wmb Date: Tue Aug 17 19:22:56 2010 New Revision: 1937 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1937 Log: x86 - memtest86 - changed -Os to -O1 in Makefile to fix runtime errors that occurred when compiling with GCC 4.4.3 (-Os worked well with GCC 4.2). The specific symptom was that Test #2 would report lots of errors in the 0xfffxx range - which wasn't supposed to be tested at all. Modified: clients/memtest86/Makefile Modified: clients/memtest86/Makefile ============================================================================== --- clients/memtest86/Makefile Wed Aug 11 20:30:05 2010 (r1936) +++ clients/memtest86/Makefile Tue Aug 17 19:22:56 2010 (r1937) @@ -28,8 +28,9 @@ CC=gcc # # gcc compiler options, these settings should suffice +# (It is tempting to use -Os, but that causes runtime failures when compiled with GCC >4.2) # -CCFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding +CCFLAGS=-Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding CCFLAGS += -fno-stack-protector CCFLAGS += $(DEFINES)

1 0

[commit] r1936 - in cpu/arm: beagle/build mmp2/build openmoko openmoko/build pxa3xx pxa3xx/build versatilepb/build
by repository service 11 Aug '10

11 Aug '10

Author: wmb Date: Wed Aug 11 20:30:05 2010 New Revision: 1936 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1936 Log: ARM - cleaned up and synchronized makefiles for all ARM targets. Modified: cpu/arm/beagle/build/Makefile cpu/arm/mmp2/build/Makefile cpu/arm/openmoko/build/Makefile cpu/arm/openmoko/openmoko.bth cpu/arm/pxa3xx/build/Makefile cpu/arm/pxa3xx/pxa3xx.bth cpu/arm/versatilepb/build/Makefile Modified: cpu/arm/beagle/build/Makefile ============================================================================== --- cpu/arm/beagle/build/Makefile Wed Aug 11 10:51:38 2010 (r1935) +++ cpu/arm/beagle/build/Makefile Wed Aug 11 20:30:05 2010 (r1936) @@ -1,35 +1,41 @@ -OS := $(shell uname) +ROMNAME=beagle BASEDIR= `(cd ../../../..; pwd;)` + +OS := $(shell uname) +HOSTCPU= $(shell ${BASEDIR}/forth/lib/hostcpu.sh) +HOSTDIR= ../../../${HOSTCPU}/${OS} +BUILDSH= ${BASEDIR}/forth/lib/build.sh + TAGFILES= ../../build/*.tag *.tag CLIENTDIR=../../../../clients CLIENTPROGS= -all: beagle.rom tags +all: ${ROMNAME}.rom tags -beagle.tag: beagle.rom +${ROMNAME}.tag: ${ROMNAME}.rom -tags: beagle.tag +tags: ${ROMNAME}.tag @${BASEDIR}/forth/lib/toctags ${BASEDIR} ${TAGFILES} -beagle.rom: FORCE build ${CLIENTPROGS} +${ROMNAME}.rom: FORCE build ${CLIENTPROGS} ${HOSTDIR}/forth ./build $@ -../../${OS}/forth: - @make -C ../../${OS} forth +${HOSTDIR}/forth: + @make -C ${HOSTDIR} forth ../../build/inflate.bin: @make -C ../../build inflate.bin -build: ../../${OS}/forth - @ln -sf ../../${OS}/forth build +build: + @ln -sf ${BUILDSH} build clean: - rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version + rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version tags *.tag clean-all: clean @make -C ../../build clean - @make -C ../../${OS} clean + @make -C ${HOSTDIR} clean .PHONY: FORCE clean all clean-all @@ -56,4 +62,3 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # # LICENSE_END - Modified: cpu/arm/mmp2/build/Makefile ============================================================================== --- cpu/arm/mmp2/build/Makefile Wed Aug 11 10:51:38 2010 (r1935) +++ cpu/arm/mmp2/build/Makefile Wed Aug 11 20:30:05 2010 (r1936) @@ -1,26 +1,28 @@ -OS := $(shell uname) +ROMNAME=ofw BASEDIR= `(cd ../../../..; pwd;)` +OS := $(shell uname) HOSTCPU= $(shell ${BASEDIR}/forth/lib/hostcpu.sh) +HOSTDIR= ../../../${HOSTCPU}/${OS} BUILDSH= ${BASEDIR}/forth/lib/build.sh TAGFILES= ../../build/*.tag *.tag CLIENTDIR=../../../../clients CLIENTPROGS= -all: ofw.rom tags +all: ${ROMNAME}.rom tags -ofw.tag: ofw.rom +${ROMNAME}.tag: ${ROMNAME}.rom -tags: ofw.tag +tags: ${ROMNAME}.tag @${BASEDIR}/forth/lib/toctags ${BASEDIR} ${TAGFILES} -ofw.rom: FORCE build ${CLIENTPROGS} ../../../${HOSTCPU}/${OS}/forth +${ROMNAME}.rom: FORCE build ${CLIENTPROGS} ${HOSTDIR}/forth ./build $@ -../../../${HOSTCPU}/${OS}/forth: - @make -C ../../../${HOSTCPU}/${OS} forth +${HOSTDIR}/forth: + @make -C ${HOSTDIR} forth ../../build/inflate.bin: @make -C ../../build inflate.bin @@ -29,11 +31,11 @@ @ln -sf ${BUILDSH} build clean: - rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version + rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version tags *.tag clean-all: clean @make -C ../../build clean - @make -C ../../${OS} clean + @make -C ${HOSTDIR} clean .PHONY: FORCE clean all clean-all @@ -60,4 +62,3 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # # LICENSE_END - Modified: cpu/arm/openmoko/build/Makefile ============================================================================== --- cpu/arm/openmoko/build/Makefile Wed Aug 11 10:51:38 2010 (r1935) +++ cpu/arm/openmoko/build/Makefile Wed Aug 11 20:30:05 2010 (r1936) @@ -1,35 +1,41 @@ -OS := $(shell uname) +ROMNAME=openmoko BASEDIR= `(cd ../../../..; pwd;)` + +OS := $(shell uname) +HOSTCPU= $(shell ${BASEDIR}/forth/lib/hostcpu.sh) +HOSTDIR= ../../../${HOSTCPU}/${OS} +BUILDSH= ${BASEDIR}/forth/lib/build.sh + TAGFILES= ../../build/*.tag *.tag CLIENTDIR=../../../../clients CLIENTPROGS= -all: openmoko.rom tags +all: ${ROMNAME}.rom tags -openmoko.tag: openmoko.rom +${ROMNAME}.tag: ${ROMNAME}.rom -tags: openmoko.tag +tags: ${ROMNAME}.tag @${BASEDIR}/forth/lib/toctags ${BASEDIR} ${TAGFILES} -openmoko.rom: FORCE build ${CLIENTPROGS} +${ROMNAME}.rom: FORCE build ${CLIENTPROGS} ${HOSTDIR}/forth ./build $@ -../../${OS}/forth: - @make -C ../../${OS} forth +${HOSTDIR}/forth: + @make -C ${HOSTDIR} forth ../../build/inflate.bin: @make -C ../../build inflate.bin -build: ../../${OS}/forth - @ln -sf ../../${OS}/forth build +build: + @ln -sf ${BUILDSH} build clean: - rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version + rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version tags *.tag clean-all: clean @make -C ../../build clean - @make -C ../../${OS} clean + @make -C ${HOSTDIR} clean .PHONY: FORCE clean all clean-all Modified: cpu/arm/openmoko/openmoko.bth ============================================================================== --- cpu/arm/openmoko/openmoko.bth Wed Aug 11 10:51:38 2010 (r1935) +++ cpu/arm/openmoko/openmoko.bth Wed Aug 11 20:30:05 2010 (r1936) @@ -1,11 +1,11 @@ -purpose: Load file for OFW on ARM beagleboard +purpose: Load file for OFW on ARM OpenMoko \ See license at end of file dictionary: ${BP}/cpu/arm/build/basefw.dic command: &armforth &dictionary &this build-now -" beagle.tag" r/w create-file drop tag-file ! +" openmoko.tag" r/w create-file drop tag-file ! \ ' $report-name is include-hook @@ -15,11 +15,10 @@ ' (initial-heap) to initial-heap -\ fload ${BP}/dev/diaguartbb.fth \ beagleboard UART3 -fload ${BP}/cpu/arm/beagle/diaguartbb.fth \ beagleboard UART3 -\ h# 50000000 to uart-base \ UART# base address on beagleboard -h# 50004000 to uart-base \ UART# base address on beagleboard -\ h# 50008000 to uart-base \ UART# base address on beagleboard +fload ${BP}/dev/omap/diaguart.fth \ OMAP UART +\ h# 50000000 to uart-base +h# 50004000 to uart-base +\ h# 50008000 to uart-base fload ${BP}/forth/lib/sysuart.fth \ Set console I/O vectors to UART Modified: cpu/arm/pxa3xx/build/Makefile ============================================================================== --- cpu/arm/pxa3xx/build/Makefile Wed Aug 11 10:51:38 2010 (r1935) +++ cpu/arm/pxa3xx/build/Makefile Wed Aug 11 20:30:05 2010 (r1936) @@ -1,35 +1,41 @@ -OS := $(shell uname) +ROMNAME=pxa3xx BASEDIR= `(cd ../../../..; pwd;)` + +OS := $(shell uname) +HOSTCPU= $(shell ${BASEDIR}/forth/lib/hostcpu.sh) +HOSTDIR= ../../../${HOSTCPU}/${OS} +BUILDSH= ${BASEDIR}/forth/lib/build.sh + TAGFILES= ../../build/*.tag *.tag CLIENTDIR=../../../../clients CLIENTPROGS= -all: pxa3xx.rom tags +all: ${ROMNAME}.rom tags -pxa3xx.tag: pxa3xx.rom +${ROMNAME}.tag: ${ROMNAME}.rom -tags: pxa3xx.tag +tags: ${ROMNAME}.tag @${BASEDIR}/forth/lib/toctags ${BASEDIR} ${TAGFILES} -pxa3xx.rom: FORCE build ${CLIENTPROGS} +${ROMNAME}.rom: FORCE build ${CLIENTPROGS} ${HOSTDIR}/forth ./build $@ -../../${OS}/forth: - @make -C ../../${OS} forth +${HOSTDIR}/forth: + @make -C ${HOSTDIR} forth ../../build/inflate.bin: @make -C ../../build inflate.bin -build: ../../${OS}/forth - @ln -sf ../../${OS}/forth build +build: + @ln -sf ${BUILDSH} build clean: - rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version + rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version tags *.tag clean-all: clean @make -C ../../build clean - @make -C ../../${OS} clean + @make -C ${HOSTDIR} clean .PHONY: FORCE clean all clean-all @@ -56,4 +62,3 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # # LICENSE_END - Modified: cpu/arm/pxa3xx/pxa3xx.bth ============================================================================== --- cpu/arm/pxa3xx/pxa3xx.bth Wed Aug 11 10:51:38 2010 (r1935) +++ cpu/arm/pxa3xx/pxa3xx.bth Wed Aug 11 20:30:05 2010 (r1936) @@ -1,11 +1,11 @@ -purpose: Load file for OFW on ARM beagleboard +purpose: Load file for OFW on ARM PXA3xx \ See license at end of file dictionary: ${BP}/cpu/arm/build/basefw.dic command: &armforth &dictionary &this build-now -" beagle.tag" r/w create-file drop tag-file ! +" pxa3xx.tag" r/w create-file drop tag-file ! \ ' $report-name is include-hook Modified: cpu/arm/versatilepb/build/Makefile ============================================================================== --- cpu/arm/versatilepb/build/Makefile Wed Aug 11 10:51:38 2010 (r1935) +++ cpu/arm/versatilepb/build/Makefile Wed Aug 11 20:30:05 2010 (r1936) @@ -1,34 +1,64 @@ -OS := $(shell uname) +ROMNAME=qemubase BASEDIR= `(cd ../../../..; pwd;)` + +OS := $(shell uname) +HOSTCPU= $(shell ${BASEDIR}/forth/lib/hostcpu.sh) +HOSTDIR= ../../../${HOSTCPU}/${OS} +BUILDSH= ${BASEDIR}/forth/lib/build.sh + TAGFILES= ../../build/*.tag *.tag CLIENTDIR=../../../../clients CLIENTPROGS= -all: qemubase.rom tags +all: ${ROMNAME}.rom tags -qemubase.tag: qemubase.rom +${ROMNAME}.tag: ${ROMNAME}.rom -tags: qemubase.tag +tags: ${ROMNAME}.tag @${BASEDIR}/forth/lib/toctags ${BASEDIR} ${TAGFILES} -qemubase.rom: FORCE build ${CLIENTPROGS} +${ROMNAME}.rom: FORCE build ${CLIENTPROGS} ${HOSTDIR}/forth ./build $@ -../../${OS}/forth: - @make -C ../../${OS} forth +${HOSTDIR}/forth: + @make -C ${HOSTDIR} forth ../../build/inflate.bin: @make -C ../../build inflate.bin -build: ../../${OS}/forth - @ln -sf ../../${OS}/forth build +build: + @ln -sf ${BUILDSH} build clean: - rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version + rm -f *.dic *.log headers *~ *.elf *.di *.img builton.fth build *.rom *.version tags *.tag clean-all: clean @make -C ../../build clean - @make -C ../../${OS} clean + @make -C ${HOSTDIR} clean .PHONY: FORCE clean all clean-all + +# LICENSE_BEGIN +# Copyright (c) 2009 FirmWorks +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# LICENSE_END

1 0

[commit] r1935 - cpu/arm/Linux cpu/x86/Linux forth/wrapper
by repository service 11 Aug '10

11 Aug '10

Author: wmb Date: Wed Aug 11 10:51:38 2010 New Revision: 1935 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1935 Log: ARM - more cross-compile tweaks. Modified: cpu/arm/Linux/armforth.static cpu/x86/Linux/armforth forth/wrapper/wrapper.c Modified: cpu/arm/Linux/armforth.static ============================================================================== Binary file (source and/or target). No diff available. Modified: cpu/x86/Linux/armforth ============================================================================== --- cpu/x86/Linux/armforth Wed Aug 11 10:50:37 2010 (r1934) +++ cpu/x86/Linux/armforth Wed Aug 11 10:51:38 2010 (r1935) @@ -1,2 +1,11 @@ #!/bin/sh -qemu-arm ${BP}/cpu/arm/Linux/armforth.static $* + +# The "-0 $0" below causes the wrapper to skip arguments +# before the -0, so the program name appears to be the +# name of this script ($0). That makes the logger put the +# this script name in the "command: " line, instead of +# putting cpu/arm/Linux/armforth.static, which is not +# directly executable in the cross environment, there. +# That makes fast-rebuilds from the .log file work right. + +qemu-arm ${BP}/cpu/arm/Linux/armforth.static -0 $0 $* Modified: forth/wrapper/wrapper.c ============================================================================== --- forth/wrapper/wrapper.c Wed Aug 11 10:50:37 2010 (r1934) +++ forth/wrapper/wrapper.c Wed Aug 11 10:51:38 2010 (r1935) @@ -815,6 +815,20 @@ argc = ccommand(&argv); #endif + /* + * This is a special accomodation for running the wrapper under an emulator + * like QEMU. You can make a shell script containing a line like: + * qemu-arm wrapper_name -0 script_name ... + * The logger will then log the name of script instead of the actual wrapper. + * An alternate would be to use Linux's binfmt_misc facility to bind the + * emulator to the wrapper binary, but the problem with that is that it + * requires root to register the binding every time you start the computer. + */ + if (argc > 1 && (0 == strcmp(argv[1], "-0"))) { + argv += 2; + argc -= 2; + } + progname = argv[0]; log_command_line(progname, dictfile, f, argc, argv);

1 0

[commit] r1934 - dev/mmc/sdhci
by repository service 11 Aug '10

11 Aug '10

Author: wmb Date: Wed Aug 11 10:50:37 2010 New Revision: 1934 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1934 Log: SD driver - added the ability to disable high-speed operation on specific platforms. Modified: dev/mmc/sdhci/sdhci.fth Modified: dev/mmc/sdhci/sdhci.fth ============================================================================== --- dev/mmc/sdhci/sdhci.fth Wed Aug 11 10:48:52 2010 (r1933) +++ dev/mmc/sdhci/sdhci.fth Wed Aug 11 10:50:37 2010 (r1934) @@ -643,6 +643,24 @@ h# e data-timeout! \ 2^26 / 48 MHz = 1.4 sec ; +false value avoid-high-speed? +: set-speed ( -- ) + avoid-high-speed? if + card-clock-25 + exit + then + + \ Ask if high-speed is supported + h# 00ff.fff1 switch-function d# 13 + c@ 2 and if \ cmd6 + h# 80ff.fff1 switch-function drop \ Perform the switch cmd6 + \ Bump the host controller clock + host-high-speed \ Changes the clock edge + card-clock-50 + else + card-clock-25 + then +; + : configure-transfer ( -- ) mmc? if 1-bit @@ -660,15 +678,7 @@ \ 1 for v1.10, and 2 for v2. get-scr c@ h# f and 0= if exit then \ acmd51 - \ Ask if high-speed is supported - h# 00ff.fff1 switch-function d# 13 + c@ 2 and if \ cmd6 - h# 80ff.fff1 switch-function drop \ Perform the switch cmd6 - \ Bump the host controller clock - host-high-speed \ Changes the clock edge - card-clock-50 - else - card-clock-25 - then + set-speed then ;

1 0

[commit] r1933 - cpu/arm/mmp2
by repository service 11 Aug '10

11 Aug '10

Author: wmb Date: Wed Aug 11 10:48:52 2010 New Revision: 1933 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1933 Log: ARM MMP2 - disable SD high-speed operation because it is unreliable on the MMP2 platform. Modified: cpu/arm/mmp2/sdhcimmp2.fth Modified: cpu/arm/mmp2/sdhcimmp2.fth ============================================================================== --- cpu/arm/mmp2/sdhcimmp2.fth Wed Aug 11 09:04:29 2010 (r1932) +++ cpu/arm/mmp2/sdhcimmp2.fth Wed Aug 11 10:48:52 2010 (r1933) @@ -4,6 +4,7 @@ fload ${BP}/cpu/arm/mmp2/sdregs.fth fload ${BP}/dev/mmc/sdhci/sdhci.fth + true to avoid-high-speed? new-device 3 encode-int " reg" property

1 0

[commit] r1932 - in cpu/arm/mmp2: . build
by repository service 11 Aug '10

11 Aug '10

Author: wmb Date: Wed Aug 11 09:04:29 2010 New Revision: 1932 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1932 Log: ARM - The build target is now back to ofw.rom, not mmp2.rom Added: cpu/arm/mmp2/ofw.bth - copied unchanged from r1924, cpu/arm/mmp2/fw.bth Deleted: cpu/arm/mmp2/fw.bth Modified: cpu/arm/mmp2/build/Makefile cpu/arm/mmp2/mmp2.bth Modified: cpu/arm/mmp2/build/Makefile ============================================================================== --- cpu/arm/mmp2/build/Makefile Wed Aug 11 07:39:50 2010 (r1931) +++ cpu/arm/mmp2/build/Makefile Wed Aug 11 09:04:29 2010 (r1932) @@ -9,14 +9,14 @@ CLIENTDIR=../../../../clients CLIENTPROGS= -all: mmp2.rom tags +all: ofw.rom tags -mmp2.tag: mmp2.rom +ofw.tag: ofw.rom -tags: mmp2.tag +tags: ofw.tag @${BASEDIR}/forth/lib/toctags ${BASEDIR} ${TAGFILES} -mmp2.rom: FORCE build ${CLIENTPROGS} ../../../${HOSTCPU}/${OS}/forth +ofw.rom: FORCE build ${CLIENTPROGS} ../../../${HOSTCPU}/${OS}/forth ./build $@ ../../../${HOSTCPU}/${OS}/forth: Modified: cpu/arm/mmp2/mmp2.bth ============================================================================== --- cpu/arm/mmp2/mmp2.bth Wed Aug 11 07:39:50 2010 (r1931) +++ cpu/arm/mmp2/mmp2.bth Wed Aug 11 09:04:29 2010 (r1932) @@ -194,6 +194,8 @@ .( --- Saving mmp2.rom --- ) cr " mmp2.rom" $save-rom +interact + \ LICENSE_BEGIN \ Copyright (c) 2010 FirmWorks \ Copied: cpu/arm/mmp2/ofw.bth (from r1924, cpu/arm/mmp2/fw.bth) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ cpu/arm/mmp2/ofw.bth Wed Aug 11 09:04:29 2010 (r1932, copy of r1924, cpu/arm/mmp2/fw.bth) @@ -0,0 +1,526 @@ +purpose: Build Open Firmware for Marvell MMP2 +\ See license at end of file + +dictionary: ${BP}/cpu/arm/build/basefw.dic +command: &armforth &dictionary &this +build-now + +" fw.tag" r/w create-file drop tag-file ! + +hex +\ ' $report-name is include-hook +' noop is include-hook + +fload ${BP}/cpu/arm/mmp2/config.fth + +: headerless ; : headers ; : headerless0 ; + +' (quit) to quit + +: \Tags [compile] \ ; immediate +: \NotTags [compile] \ ; immediate + +: RAMbase ( -- adr ) fw-virt-base ; +: RAMtop ( -- adr ) RAMbase /fw-ram + ; + +def-load-base ' load-base set-config-int-default + +use-movable-vector-base \ Marvell CPU core has a movable vector base + +true ' fcode-debug? set-config-int-default +\ false ' auto-boot? set-config-int-default + + + +[ifdef] serial-console +" com1" ' output-device set-config-string-default +" com1" ' input-device set-config-string-default +[then] + + +fload ${BP}/cpu/arm/mmp2/rootnode.fth \ Root node mapping - physical mode +dev / + " Marvell,Bonnell" model + " Marvell,Armada 610" encode-string " architecture" property +\ The clock frequency of the root bus may be irrelevant, since the bus is internal to the SOC +\ d# 1,000,000,000 " clock-frequency" integer-property +device-end + +: (cpu-arch ( -- adr len ) + " architecture" ['] root-node get-package-property drop + get-encoded-string +; +' (cpu-arch to cpu-arch + +\ Memory management services +[ifdef] virtual-mode +fload ${BP}/ofw/core/clntmem1.fth \ client services for memory +[else] +fload ${BP}/ofw/core/clntphy1.fth \ client services for memory +: >physical ( va -- pa ) + dup fw-virt-base - fw-virt-size u< if ( va ) + fw-virt-base - fw-pa + + then +; +[then] +fload ${BP}/ofw/core/memlist.fth \ Resource list common routines +fload ${BP}/ofw/core/showlist.fth \ Linked list display tool +fload ${BP}/ofw/core/allocph1.fth \ S Physical memory allocator +fload ${BP}/ofw/core/availpm.fth \ Available memory list + +fload ${BP}/cpu/arm/mmp2/probemem.fth \ Memory probing + +stand-init: Probing memory + " probe" memory-node @ $call-method +; + +[ifdef] virtual-mode +fload ${BP}/cpu/arm/loadvmem.fth \ /mmu node +stand-init: MMU + " /mmu" open-dev mmu-node ! +; +fload ${BP}/ofw/core/initdict.fth \ Dynamic dictionary allocation +fload ${BP}/arch/arm/loadarea.fth \ Allocate and map program load area +[else] +fload ${BP}/cpu/arm/mmp2/mmuon.fth +[then] + +\ XXX should be elsewhere +dev /client-services +: chain ( len args entry size virt -- ) + release ( len args entry ) + h# 8000 alloc-mem h# 8000 + (init-program) ( len args ) + to r1 to r2 + go +; +device-end + +fload ${BP}/cpu/arm/crc32.fth \ Assembly language Zip CRC calculation +fload ${BP}/forth/lib/crc32.fth \ High-level portion of CRC calculation + +[ifdef] resident-packages + +\needs unix-seconds> fload ${BP}/ofw/fs/unixtime.fth \ Unix time calculation +support-package: ext2-file-system + fload ${BP}/ofw/fs/ext2fs/ext2fs.fth \ Linux file system +end-support-package + +[ifdef] jffs2-support +\needs unix-seconds> fload ${BP}/ofw/fs/unixtime.fth \ Unix time calculation +support-package: jffs2-file-system + fload ${BP}/ofw/fs/jffs2/jffs2.fth \ Journaling flash file system 2 +end-support-package +[then] + +support-package: zip-file-system + fload ${BP}/ofw/fs/zipfs.fth \ Zip file system +end-support-package + +support-package: dropin-file-system + fload ${BP}/ofw/fs/dropinfs.fth \ Dropin file system +end-support-package +[then] + +fload ${BP}/ofw/core/osfile.fth \ For testing + +\ Load file format handlers + +: call32 ; + +fload ${BP}/ofw/core/allocsym.fth \ Allocate memory for symbol table +fload ${BP}/ofw/core/symcif.fth +fload ${BP}/ofw/core/symdebug.fth +: release-load-area ( boundary-adr -- ) drop ; + +[ifdef] use-elf +fload ${BP}/ofw/elf/elf.fth +fload ${BP}/ofw/elf/elfdebug.fth +[ifdef] virtual-mode +\ Depends on the assumption that physical memory is mapped 1:1 already +: (elf-map-in) ( va size -- ) 0 mem-claim drop ; +[else] +: (elf-map-in) ( va size -- ) 2drop ; +[then] +' (elf-map-in) is elf-map-in +[then] + +\ Reboot and re-entry code +fload ${BP}/ofw/core/reboot.fth \ Restart the client program +fload ${BP}/ofw/core/reenter.fth \ Various entries into Forth + +headerless +[ifdef] virtual-mode +: (initial-heap) ( -- adr len ) sp0 @ ps-size - dict-limit tuck - ; +[else] + \ : (initial-heap) ( -- adr len ) RAMtop heap-size ; +: (initial-heap) ( -- adr len ) limit heap-size ; +[then] +' (initial-heap) is initial-heap +headers + +" /openprom" find-device + " FirmWorks,3.0" encode-string " model" property +device-end + +[ifdef] virtual-mode +fload ${BP}/cpu/arm/mmusetup.fth \ Initial values for MMU lists +[then] + +: background-rgb ( -- r g b ) h# ff h# ff h# ff ; + +fload ${BP}/cpu/arm/mmp2/devices.fth + +[ifndef] virtual-mode +warning off +: stand-init-io + stand-init-io + go-fast \ From mmuon.fth +; +warning on +[then] + +true ' local-mac-address? set-config-int-default +[ifdef] resident-packages +support-package: nfs + fload ${BP}/ofw/fs/nfs/loadpkg.fth +end-support-package + +[then] +devalias nfs net//obp-tftp:last//nfs + +fload ${BP}/cpu/arm/linux.fth +h# 20.0000 to linux-params \ The Jasper Linux kernel fails unless the params are between 0x20.0000 and 0x20.4000 +d# 2382 to arm-linux-machine-type \ Marvell Jasper + +\ Add a tag describing the linear frame buffer +: mmp-fb-tag, ( -- ) + 8 tag-l, + h# 54410008 tag-l, \ ATAG_VIDEOLFB + d# 800 tag-w, \ Width + d# 480 tag-w, \ Height + d# 24 tag-w, \ Depth + d# 800 3 * tag-w, \ Pitch + fb-pa tag-l, \ Base address + d# 800 3 * d# 480 * tag-l, \ Total size - perhaps could be larger + 8 tag-b, \ Red size + d# 0 tag-b, \ Red position + 8 tag-b, \ Green size + d# 8 tag-b, \ Green position + 8 tag-b, \ Blue size + d# 16 tag-b, \ Blue position + 0 tag-b, \ Rsvd size + d# 24 tag-b, \ Rsvd position +; +\ ' mmp-fb-tag, to fb-tag, + +\ fload ${BP}/cpu/arm/mmp2/usb.fth + +false to stand-init-debug? +\ true to stand-init-debug? + +: protect-fw ( -- ) ; +: usb-power-on ( -- ) ; + +hex +: i-key-wait ( ms -- pressed? ) + cr ." Type 'i' to interrupt stand-init sequence" cr ( ms ) + 0 do + ukey? if + ukey upc ascii I = if true unloop exit then + then + 1 ms + loop + false +; + +warning @ warning off +: init +\ initial-heap add-memory + init + + standalone? if + disable-interrupts +[ifdef] notdef + d# 1000 + i-key-wait if +\ protect-fw + ." Interacting" cr hex interact + then + \ Turn on USB power here to overlap the time with other startup actions + usb-power-on +[then] + then +; +warning ! +[then] + +: (.firmware) ( -- ) + ." Open Firmware " .built cr + ." Copyright 2010 FirmWorks All Rights Reserved" cr +; +' (.firmware) to .firmware + +fload ${BP}/ofw/gui/bmptools.fth +fload ${BP}/dev/null.fth +fload ${BP}/ofw/core/bailout.fth + +\ GUI +false value gui-safeboot? + +: 2tuck ( d1 d2 -- d2 d1 d2 ) 2swap 2over ; +: user-ok "ok" ; \ This is supposed to check for authorization +true value user-mode? + +fload ${BP}/ofw/gui/loadmenu.fth +\ fload ${BP}/ofw/gui/insticon.fth + +\ Uninstall the diag menu from the general user interface vector +\ so exiting from emacs doesn't invoke the diag menu. +' quit to user-interface + +: screen-#lines ( -- n ) + screen-ih 0= if default-#lines exit then + screen-ih package( #lines )package +; +' screen-#lines to lines/page + +true value text-on? +: text-off ( -- ) + text-on? if + screen-ih remove-output + false to text-on? + then +; +: text-on ( -- ) + text-on? 0= if + screen-ih add-output + cursor-on + true to text-on? + then +; + +fload ${BP}/cpu/x86/pc/olpc/help.fth + +[ifdef] notyet +fload ${BP}/cpu/x86/pc/olpc/gamekeys.fth + +: emacs ( -- ) + false to already-go? + boot-getline to boot-file " rom:emacs" $boot +; + +fload ${BP}/ofw/gui/ofpong.fth +fload ${BP}/cpu/x86/pc/olpc/life.fth +[then] + +" u:\boot\olpc.fth ext:\boot\olpc.fth int:\boot\olpc.fth ext:\zimage /prober /usb/ethernet /usb/wlan" + ' boot-device set-config-string-default + +\needs ramdisk " " d# 128 config-string ramdisk +" " ' boot-file set-config-string-default \ Let the boot script set the cmdline + +\ Eliminate 4 second delay in install console for the case where +\ there is no keyboard. The delay is unnecessary because the screen +\ does not go blank when the device is closed. +patch drop ms install-console + +alias reboot bye + +alias crcgen drop ( crc byte -- crc' ) + +\ Dictionary growth size for the ARM Image Format header +\ 1 section before origin section table +h# 10.0000 h# 8000 - h# 4000 - dictionary-size ! + +fload ${BP}/cpu/arm/saverom.fth \ Save the dictionary for standalone startup + +fload ${BP}/forth/lib/selstr.fth + +fload ${BP}/ofw/inet/loadtcp.fth + +support-package: http + fload ${BP}/ofw/inet/http.fth \ HTTP client +end-support-package + +[ifdef] notyet +fload ${BP}/cpu/x86/pc/olpc/memtest.fth +[then] + +[ifdef] notyet +fload ${BP}/ofw/wifi/wifi-cfg.fth +support-package: supplicant +fload ${BP}/ofw/wifi/loadpkg.fth +end-support-package + +: ofw-ssids ( -- $ ) " OFWSSID" ; +' ofw-ssids to default-ssids +[then] + +fload ${BP}/ofw/inet/sntp.fth +: olpc-ntp-servers ( -- ) + " DHCP time 172.18.0.1 0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org" +; +' olpc-ntp-servers to ntp-servers +: ntp-time&date ( -- s m h d m y ) + ntp-timestamp abort" Can't contact NTP server" + ntp>time&date +; +: .clock ( -- ) + time&date .date space .time ." UTC" cr +; +: ntp-set-clock ( -- ) + ntp-time&date " set-time" clock-node @ $call-method + .clock +; + +[ifdef] use-ppp +fload ${BP}/ofw/ppp/loadppp.fth +[then] + +" dhcp" ' ip-address set-config-string-default + +[ifdef] notyet +: c1-idle ( -- ) interrupts-enabled? if halt then ; +' c1-idle to stdin-idle +[then] + +fload ${BP}/ofw/core/countdwn.fth \ Startup countdown + +: console-start ( -- ) + install-mux-io +\ cursor-off + true to text-on? + + " //null" open-dev to null-ih \ For text-off state +; + +: interpreter-init ( -- ) + hex + warning on + only forth also definitions + +\ install-alarm + + page-mode + #line off + +\ .built cr +; + +[ifdef] notyet +: ?games ( -- ) + rocker-right game-key? if + protect-fw + time&date 5drop 1 and if + ['] pong guarded + else + ['] life-demo guarded + then + power-off + then +; +: ?diags ( -- ) + rocker-left game-key? if + protect-fw + text-on " test-all" ['] eval guarded + ." Tests complete - powering off" cr d# 5000 ms power-off + then +; + +: ?scan-nand ( -- ) + rocker-up game-key? if + protect-fw text-on ['] scan-nand guarded + then +; +: ?fs-update ( -- ) + button-check button-x or button-o or button-square or ( mask ) + game-key-mask = if protect-fw try-fs-update then +; +[then] + +: startup ( -- ) + standalone? 0= if exit then + +\ block-exceptions + no-page + + console-start + +[ifdef] notyet + read-game-keys +[then] + +\ text-off + + " probe-" do-drop-in + +[ifdef] notyet + sound + ?games +[then] + + ['] false to interrupt-auto-boot? +[ifdef] probe-usb + probe-usb + report-disk + report-keyboard +[then] + " probe+" do-drop-in + + interpreter-init +[ifdef] notyet + ?scan-nand + ?diags + ?fs-update +[then] +\ unblock-exceptions + ['] (interrupt-auto-boot?) to interrupt-auto-boot? +\ ?usb-keyboard + auto-banner? if banner then + + auto-boot + + cr cr + + quit +; + +\ This helps with TeraTerm, which sends ESC-O as the arrow key prefix +also hidden also keys-forth definitions +warning @ warning off +: esc-o key lastchar ! [""] esc-[ do-command ; +warning ! +previous previous definitions + +tag-file @ fclose tag-file off + +.( --- Saving fw.dic ...) +" fw.dic" $save-forth cr + +fload ${BP}/cpu/arm/mmp2/boot.fth + +.( --- Saving ofw.rom --- ) cr " ofw.rom" $save-rom + +\ LICENSE_BEGIN +\ Copyright (c) 2010 FirmWorks +\ +\ Permission is hereby granted, free of charge, to any person obtaining +\ a copy of this software and associated documentation files (the +\ "Software"), to deal in the Software without restriction, including +\ without limitation the rights to use, copy, modify, merge, publish, +\ distribute, sublicense, and/or sell copies of the Software, and to +\ permit persons to whom the Software is furnished to do so, subject to +\ the following conditions: +\ +\ The above copyright notice and this permission notice shall be +\ included in all copies or substantial portions of the Software. +\ +\ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +\ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +\ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +\ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +\ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +\ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +\ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +\ +\ LICENSE_END

1 0

[commit] r1931 - cpu/arm/mmp2/build forth/lib
by repository service 11 Aug '10

11 Aug '10

Author: wmb Date: Wed Aug 11 07:39:50 2010 New Revision: 1931 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1931 Log: ARM - still more tweaking for smooth cross-building. Added: forth/lib/hostcpu.sh (contents, props changed) Modified: cpu/arm/mmp2/build/Makefile forth/lib/build.sh Modified: cpu/arm/mmp2/build/Makefile ============================================================================== --- cpu/arm/mmp2/build/Makefile Wed Aug 11 07:17:39 2010 (r1930) +++ cpu/arm/mmp2/build/Makefile Wed Aug 11 07:39:50 2010 (r1931) @@ -1,16 +1,13 @@ OS := $(shell uname) -CPU := $(shell uname -m) - -# We only need to build the native wrapper if we are compiling on an ARM host -ifeq ($(findstring arm,${CPU}),arm) - NATIVEWRAPPER=../../${OS}/forth -endif BASEDIR= `(cd ../../../..; pwd;)` + +HOSTCPU= $(shell ${BASEDIR}/forth/lib/hostcpu.sh) +BUILDSH= ${BASEDIR}/forth/lib/build.sh + TAGFILES= ../../build/*.tag *.tag CLIENTDIR=../../../../clients CLIENTPROGS= -BUILDSH= ${BASEDIR}/forth/lib/build.sh all: mmp2.rom tags @@ -19,11 +16,11 @@ tags: mmp2.tag @${BASEDIR}/forth/lib/toctags ${BASEDIR} ${TAGFILES} -mmp2.rom: FORCE build ${CLIENTPROGS} ${NATIVEWRAPPER} +mmp2.rom: FORCE build ${CLIENTPROGS} ../../../${HOSTCPU}/${OS}/forth ./build $@ -../../${OS}/forth: - @make -C ../../${OS} forth +../../../${HOSTCPU}/${OS}/forth: + @make -C ../../../${HOSTCPU}/${OS} forth ../../build/inflate.bin: @make -C ../../build inflate.bin Modified: forth/lib/build.sh ============================================================================== --- forth/lib/build.sh Wed Aug 11 07:17:39 2010 (r1930) +++ forth/lib/build.sh Wed Aug 11 07:39:50 2010 (r1931) @@ -36,19 +36,7 @@ # Set HOSTDIR according to the value of BP and the host system test -n "$HOSTDIR" || { OSNAME=`uname` - MACHNAME=`uname -m` - case ${MACHNAME} in - sun4c) CPUNAME=sparc ;; - sun4u) CPUNAME=sparc ;; - ppc) CPUNAME=powerpc ;; - i386) CPUNAME=x86 ;; - i586) CPUNAME=x86 ;; - i686) CPUNAME=x86 ;; - mips) CPUNAME=mips ;; - arm*) CPUNAME=arm ;; - sun3) CPUNAME=m68k ;; - *) CPUNAME=${MACHNAME} ;; - esac + CPUNAME=`${BP}/forth/lib/hostcpu.sh` } export HOSTDIR=${BP}/cpu/${CPUNAME}/${OSNAME} Added: forth/lib/hostcpu.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ forth/lib/hostcpu.sh Wed Aug 11 07:39:50 2010 (r1931) @@ -0,0 +1,12 @@ +#!/bin/sh +MACHNAME=`uname -m` +case ${MACHNAME} in + sun4*) CPUNAME=sparc ;; + ppc) CPUNAME=powerpc ;; + i*86) CPUNAME=x86 ;; + mips) CPUNAME=mips ;; + arm*) CPUNAME=arm ;; + sun3) CPUNAME=m68k ;; + *) CPUNAME=${MACHNAME} ;; +esac +echo ${CPUNAME}

1 0

[commit] r1930 - cpu/arm/mmp2/build forth/lib
by repository service 11 Aug '10

11 Aug '10

Author: wmb Date: Wed Aug 11 07:17:39 2010 New Revision: 1930 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1930 Log: ARM - still more tweaking for smooth cross-building. Modified: cpu/arm/mmp2/build/Makefile forth/lib/build.sh Modified: cpu/arm/mmp2/build/Makefile ============================================================================== --- cpu/arm/mmp2/build/Makefile Wed Aug 11 07:06:53 2010 (r1929) +++ cpu/arm/mmp2/build/Makefile Wed Aug 11 07:17:39 2010 (r1930) @@ -2,7 +2,7 @@ CPU := $(shell uname -m) # We only need to build the native wrapper if we are compiling on an ARM host -ifeq ($CPU, arm) +ifeq ($(findstring arm,${CPU}),arm) NATIVEWRAPPER=../../${OS}/forth endif Modified: forth/lib/build.sh ============================================================================== --- forth/lib/build.sh Wed Aug 11 07:06:53 2010 (r1929) +++ forth/lib/build.sh Wed Aug 11 07:17:39 2010 (r1930) @@ -45,8 +45,7 @@ i586) CPUNAME=x86 ;; i686) CPUNAME=x86 ;; mips) CPUNAME=mips ;; - arm) CPUNAME=arm ;; - arm32) CPUNAME=arm ;; + arm*) CPUNAME=arm ;; sun3) CPUNAME=m68k ;; *) CPUNAME=${MACHNAME} ;; esac

1 0

[commit] r1929 - cpu/arm/mmp2/build
by repository service 11 Aug '10

11 Aug '10

Author: wmb Date: Wed Aug 11 07:06:53 2010 New Revision: 1929 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/1929 Log: ARM - more tweaking for smooth cross-building. Modified: cpu/arm/mmp2/build/Makefile Modified: cpu/arm/mmp2/build/Makefile ============================================================================== --- cpu/arm/mmp2/build/Makefile Wed Aug 11 06:55:28 2010 (r1928) +++ cpu/arm/mmp2/build/Makefile Wed Aug 11 07:06:53 2010 (r1929) @@ -1,4 +1,10 @@ OS := $(shell uname) +CPU := $(shell uname -m) + +# We only need to build the native wrapper if we are compiling on an ARM host +ifeq ($CPU, arm) + NATIVEWRAPPER=../../${OS}/forth +endif BASEDIR= `(cd ../../../..; pwd;)` TAGFILES= ../../build/*.tag *.tag @@ -13,7 +19,7 @@ tags: mmp2.tag @${BASEDIR}/forth/lib/toctags ${BASEDIR} ${TAGFILES} -mmp2.rom: FORCE build ../../${OS}/forth ${CLIENTPROGS} +mmp2.rom: FORCE build ${CLIENTPROGS} ${NATIVEWRAPPER} ./build $@ ../../${OS}/forth:

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

openfirmware