summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2013-03-14 06:49:04 +0000
committerTom Rini <trini@ti.com>2013-03-24 12:49:12 -0400
commitbd380cf4cf9ae5b970f09784a90132bee80ee5d0 (patch)
treeac8233397619196c897fb1d421f60f20d6e4d9c5
parentc7ba18ad4b52d35b0166eeecbe05a0e1560e00ec (diff)
downloadtalos-obmc-uboot-bd380cf4cf9ae5b970f09784a90132bee80ee5d0.tar.gz
talos-obmc-uboot-bd380cf4cf9ae5b970f09784a90132bee80ee5d0.zip
arm: Correct CONFIG_STANDALONE_LOAD_ADDR for AM33XX/OMAP* platforms
All of these platforms have memory starting at 0x80000000, so this is the correct CONFIG_STANDALONE_LOAD_ADDR for all of them. Acked-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: Tom Rini <trini@ti.com>
-rw-r--r--arch/arm/config.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/config.mk b/arch/arm/config.mk
index a0c89b7971..e7839beced 100644
--- a/arch/arm/config.mk
+++ b/arch/arm/config.mk
@@ -24,7 +24,7 @@
CROSS_COMPILE ?= arm-linux-
ifndef CONFIG_STANDALONE_LOAD_ADDR
-ifeq ($(SOC),omap3)
+ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TI814X),)
CONFIG_STANDALONE_LOAD_ADDR = 0x80300000
else
CONFIG_STANDALONE_LOAD_ADDR = 0xc100000
OpenPOWER on IntegriCloud