Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / arch / nios2 / config.mk

diff --git a/arch/nios2/config.mk b/arch/nios2/config.mk
index aba96b30199346c03749f7f0e2523accd0af7986..7b03ed81b1e31bd10b1270dc7efcd06d5667809c 100644 (file)
--- a/arch/nios2/config.mk
+++ b/arch/nios2/config.mk
@@ -24,12 +24,10 @@
 
 CROSS_COMPILE ?= nios2-elf-
 
-STANDALONE_LOAD_ADDR ?= 0x02000000
+CONFIG_STANDALONE_LOAD_ADDR ?= 0x02000000
 
 PLATFORM_CPPFLAGS += -DCONFIG_NIOS2 -D__NIOS2__
 PLATFORM_CPPFLAGS += -G0
 
-LDSCRIPT ?= $(SRCTREE)/$(CPUDIR)/u-boot.lds
-
-LDFLAGS += --gc-sections
+LDFLAGS_FINAL += --gc-sections
 PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections