[openfirmware] [commit] r2117 - in cpu: arm/build x86/Linux
repository service
svn at openfirmware.info
Tue Jan 18 22:18:33 CET 2011
Author: wmb
Date: Tue Jan 18 22:18:33 2011
New Revision: 2117
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2117
Log:
ARM - Improvements in ARM cross-build makefiles.
Deleted:
cpu/x86/Linux/Makefile.armforth
Modified:
cpu/arm/build/Makefile
cpu/x86/Linux/Makefile
Modified: cpu/arm/build/Makefile
==============================================================================
--- cpu/arm/build/Makefile Tue Jan 18 21:49:15 2011 (r2116)
+++ cpu/arm/build/Makefile Tue Jan 18 22:18:33 2011 (r2117)
@@ -2,7 +2,7 @@
OS := $(shell uname)
HOSTCPU= $(shell ${BASEDIR}/forth/lib/hostcpu.sh)
-HOSTDIR= ../${HOSTCPU}/${OS}
+HOSTDIR= ../../${HOSTCPU}/${OS}
BUILDSH= ${BASEDIR}/forth/lib/build.sh
all: basefw.dic
@@ -11,10 +11,13 @@
.PRECIOUS: builder.dic
-../${OS}/forth:
- @make -C ../${OS} forth
+${HOSTDIR}/forth:
+ @make -C ${HOSTDIR} forth
-build:
+${HOSTDIR}/armforth:
+ @make -C ${HOSTDIR} armforth
+
+build: ${HOSTDIR}/forth ${HOSTDIR}/armforth
@ln -sf ${BUILDSH} build
# build: ../${OS}/forth
Modified: cpu/x86/Linux/Makefile
==============================================================================
--- cpu/x86/Linux/Makefile Tue Jan 18 21:49:15 2011 (r2116)
+++ cpu/x86/Linux/Makefile Tue Jan 18 22:18:33 2011 (r2117)
@@ -45,5 +45,27 @@
%.o: ${ZIPDIR}/%.c
${CC} -c ${CFLAGS} -I${ZIPDIR} $< -o $@
+%.o: ${ARMDIR}/%.c
+ ${CC} -c ${ARMCFLAGS} $< -o $@
+
+# ARM simulator wrapper build rules
+
+ARMDIR = ${BP}/cpu/arm
+ARMCFLAGS = -g -m32 -DARMSIM -DTARGET_ARM -DARM -DSIMNEXT
+ARMSIMOBJS = wrapsim.o armsim.o logger.o ${ZIPOBJS}
+ARMTRACEOBJS = wrapsim.o armsim.trace.o logger.o ${ZIPOBJS}
+
+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
More information about the openfirmware
mailing list