[openfirmware] [commit] r2118 - cpu/arm/olpc/1.75/build cpu/x86/Linux forth/wrapper
repository service
svn at openfirmware.info
Tue Jan 18 22:41:32 CET 2011
Author: wmb
Date: Tue Jan 18 22:41:32 2011
New Revision: 2118
URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2118
Log:
ARM - More fixes to cross-build makefiles.
Modified:
cpu/arm/olpc/1.75/build/Makefile
cpu/x86/Linux/Makefile
forth/wrapper/wrapper.c
Modified: cpu/arm/olpc/1.75/build/Makefile
==============================================================================
--- cpu/arm/olpc/1.75/build/Makefile Tue Jan 18 22:18:33 2011 (r2117)
+++ cpu/arm/olpc/1.75/build/Makefile Tue Jan 18 22:41:32 2011 (r2118)
@@ -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/Linux/Makefile
==============================================================================
--- cpu/x86/Linux/Makefile Tue Jan 18 22:18:33 2011 (r2117)
+++ cpu/x86/Linux/Makefile Tue Jan 18 22:41:32 2011 (r2118)
@@ -45,9 +45,6 @@
%.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
@@ -55,6 +52,9 @@
ARMSIMOBJS = wrapsim.o armsim.o logger.o ${ZIPOBJS}
ARMTRACEOBJS = wrapsim.o armsim.trace.o logger.o ${ZIPOBJS}
+%.o: ${ARMDIR}/%.c
+ ${CC} -c ${ARMCFLAGS} $< -o $@
+
wrapsim.o: ${WRDIR}/wrapper.c
${CC} -c ${ARMCFLAGS} -c $< -o $@
Modified: forth/wrapper/wrapper.c
==============================================================================
--- forth/wrapper/wrapper.c Tue Jan 18 22:18:33 2011 (r2117)
+++ forth/wrapper/wrapper.c Tue Jan 18 22:41:32 2011 (r2118)
@@ -1005,10 +1005,6 @@
# 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
loadaddr = (char *)m_alloc(dictsize);
More information about the openfirmware
mailing list