[openfirmware] [commit] r2115 - cpu/x86/Linux

[repository service]

Author: wmb
Date: Tue Jan 18 21:37:18 2011
New Revision: 2115
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2115

Log:
ARM - moving things around in the ARM cross-build arena, working toward seamless builds using the ARM simulator wrapper.

Added:
   cpu/x86/Linux/Makefile.armforth
      - copied unchanged from r2097, cpu/x86/Linux/Makefile.armsim
   cpu/x86/Linux/armforth.qemu
      - copied unchanged from r2109, cpu/x86/Linux/armforth
Deleted:
   cpu/x86/Linux/Makefile.armsim
   cpu/x86/Linux/armforth

Copied: cpu/x86/Linux/Makefile.armforth (from r2097, cpu/x86/Linux/Makefile.armsim)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ cpu/x86/Linux/Makefile.armforth	Tue Jan 18 21:37:18 2011	(r2115, copy of r2097, cpu/x86/Linux/Makefile.armsim)
@@ -0,0 +1,56 @@
+# Wrapper makefile for x86 Mac OS X / Darwin
+
+BP=../../..
+
+# Flags for the simulator version
+OPT = -O
+CFLAGS	= -g -m32 -DARMSIM -DTARGET_ARM -DARM
+
+WRTAIL = forth/wrapper
+WRDIR = ${BP}/${WRTAIL}
+ZIPTAIL = ${WRTAIL}/zip
+ZIPDIR = ${BP}/${ZIPTAIL}
+ARMDIR = ${BP}/cpu/arm
+
+ZIPOBJS = zipmem.o deflate.o trees.o bits.o util.o inflate.o
+
+OBJS = wrapsim.o armsim.o logger.o ${ZIPOBJS}
+TRACEOBJS = wrapsim.o armsim.trace.o logger.o ${ZIPOBJS}
+SIMROMOBJS = simrom.o armsim.simrom.o
+
+all: armforth armforth.trace
+
+armforth: $(OBJS)
+	$(CC) $(LFLAGS)  $(OBJS)  -o $@
+
+armforth.trace: $(TRACEOBJS)
+	$(CC) $(LFLAGS)  $(TRACEOBJS)  -o $@
+
+simrom: $(SIMROMOBJS)
+	$(CC) $(LFLAGS)  $(SIMROMOBJS)  -o $@
+
+wrapsim.o: ${WRDIR}/wrapper.c
+	${CC} -c ${CFLAGS} $< -o $@
+
+%.o: ${WRDIR}/%.c
+	${CC} -c ${CFLAGS} $< -o $@
+
+%.o: ${ZIPDIR}/%.c
+	${CC} -c ${CFLAGS} -I${ZIPDIR} $< -o $@
+
+armsim.o: $(ARMDIR)/armsim.c
+	$(CC) $(OPT) $(CFLAGS) -DARGREGS -DSIMNEXT -c $< -o $@
+
+armsim.trace.o: $(ARMDIR)/armsim.c
+	$(CC) $(OPT) $(CFLAGS)  -DARGREGS -DSIMNEXT -DTRACE=1 -c $< -o $@
+
+armsim.simrom.o: $(ARMDIR)/armsim.c
+	$(CC) $(CFLAGS)  -DARGREGS -DSIMNEXT -DTRACE=1 -DSIMROM -c $< -o $@
+
+simrom.o: $(ARMDIR)/simrom.c
+	$(CC) $(CFLAGS)  -DARGREGS -DSIMNEXT -DTRACE=1 -DSIMROM -c $< -o $@
+
+clean:
+	@rm -f *.o armforth armforth.trace
+
+FRC:

Copied: cpu/x86/Linux/armforth.qemu (from r2109, cpu/x86/Linux/armforth)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ cpu/x86/Linux/armforth.qemu	Tue Jan 18 21:37:18 2011	(r2115, copy of r2109, cpu/x86/Linux/armforth)
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# 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 $*