summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <j.beisert@pengutronix.de>2007-11-09 14:09:54 +0100
committerJuergen Beisert <j.beisert@pengutronix.de>2007-11-09 14:09:54 +0100
commit9b77ffedf7fa2235268ae6b89a0657fc275eab19 (patch)
tree229b2f8703bea8c37defb24b96cff5dc8c2ad732
parent9b07bdbbdcd99ba75d24bddb2be7fe4141e10541 (diff)
parentff0b72196231e59d58fdde0df0afaba6ab8e2a7a (diff)
downloadbarebox-9b77ffedf7fa2235268ae6b89a0657fc275eab19.tar.gz
barebox-9b77ffedf7fa2235268ae6b89a0657fc275eab19.tar.xz
Merge branch 'master' of jbe@octopus:/home/git/projects/u-boot-v2v2.0.0-rc1
-rw-r--r--arch/sandbox/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sandbox/Makefile b/arch/sandbox/Makefile
index 7701c68620..80545e90a9 100644
--- a/arch/sandbox/Makefile
+++ b/arch/sandbox/Makefile
@@ -6,7 +6,6 @@ CPPFLAGS += -fno-builtin -ffreestanding -nostdinc -Wall \
machine-y := sandbox
-lds-y := arch/sandbox/lib/u-boot.lds
BOARD:= arch/sandbox/lib
board-y := sandbox
lds-y := arch/sandbox/lib/u-boot.lds