Author: wmb Date: Tue Jun 14 04:38:55 2011 New Revision: 2273 URL: http://tracker.coreboot.org/trac/openfirmware/changeset/2273
Log: OLPC XO-1.75 trac #10884 - Nandblaster for ARM - tweaks to make it compile natively on koji2.
Modified: clients/lib/arm/makefile cpu/arm/olpc/1.75/mcnand-version.fth
Modified: clients/lib/arm/makefile ============================================================================== --- clients/lib/arm/makefile Tue Jun 14 04:20:57 2011 (r2272) +++ clients/lib/arm/makefile Tue Jun 14 04:38:55 2011 (r2273) @@ -2,10 +2,21 @@
# -fno-builtin has the effect of suppressing some warnings about # functions that conflict with gcc builtins -ARCH=/usr/local/arm -UTILS=$(ARCH)/arm-linux/bin -CC=$(UTILS)/gcc + +ifneq (arm, $(findstring arm,$(shell uname -p))) + # Cross-compiler setup + ARCH := /usr/local/arm + UTILS := $(ARCH)/arm-linux/bin + CC := $(UTILS)/gcc + LD := $(UTILS)/ld +else + CC := gcc +endif + CFLAGS = -I.. -O2 -mcpu=strongarm110 +ifeq (y, $(shell $(CC) -xc -c -fno-stack-protector /dev/null -o /dev/null 2>/dev/null && echo y)) + CFLAGS += -fno-stack-protector +endif
all: libobp.a hello start.o
Modified: cpu/arm/olpc/1.75/mcnand-version.fth ============================================================================== --- cpu/arm/olpc/1.75/mcnand-version.fth Tue Jun 14 04:20:57 2011 (r2272) +++ cpu/arm/olpc/1.75/mcnand-version.fth Tue Jun 14 04:38:55 2011 (r2273) @@ -3,6 +3,6 @@ \ With a specific ID, mcastnand.bth will download a tarball without .git stuff. \ With "test", mcastnand.bth will clone the git head if build/multicast-nand/ \ is not already present, then you can modify the git subtree as needed. -macro: MCNAND_VERSION 3975692c3311749185ec1ecba706388e3924a284 +macro: MCNAND_VERSION 3537d14318e0eac205dda2f8dcd524f24b9cabe3 \ macro: MCNAND_VERSION test \ macro: MCNAND_VERSION HEAD