summaryrefslogtreecommitdiff
path: root/lib_nios
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-12-05 01:11:59 (GMT)
committerWolfgang Denk <wd@denx.de>2009-12-05 01:11:59 (GMT)
commit2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70 (patch)
treee19b3def6c8f41f56cdb5e8b71aa53d8f72f5812 /lib_nios
parentcd514aeb996e2f7aefbe1f78481965d9d074aed4 (diff)
parentf68ab43de67f59925542efb6bcec30f4a84fe695 (diff)
downloadu-boot-2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70.tar.xz
Merge branch 'master' into next
Conflicts: board/esd/plu405/plu405.c drivers/rtc/ftrtc010.c Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'lib_nios')
-rw-r--r--lib_nios/config.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib_nios/config.mk b/lib_nios/config.mk
index d48aa6d..e1b9f07 100644
--- a/lib_nios/config.mk
+++ b/lib_nios/config.mk
@@ -24,6 +24,6 @@
CROSS_COMPILE ?= nios-elf-
-STANDALONE_LOAD_ADDR = 0x00800000 -L $(gcclibdir)/m32 -T nios.lds
+STANDALONE_LOAD_ADDR = 0x00800000 -L $(gcclibdir)/m32
PLATFORM_CPPFLAGS += -m32 -DCONFIG_NIOS -D__NIOS__ -ffixed-g7 -gstabs