diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-24 17:52:22 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-03-24 17:52:22 +0100 |
| commit | b6379e15a70cc2e22486e5962927d9de374d877b (patch) | |
| tree | ce5c97f3754c29fa5d69a2da9b651ed59e876189 /arch/arm/config.mk | |
| parent | 536121328eae940458f065608345b5fed8286859 (diff) | |
| parent | 173ddc5b68fa41e55293d1095cafdc21fd11cf65 (diff) | |
| download | u-boot-imx-b6379e15a70cc2e22486e5962927d9de374d877b.zip u-boot-imx-b6379e15a70cc2e22486e5962927d9de374d877b.tar.gz u-boot-imx-b6379e15a70cc2e22486e5962927d9de374d877b.tar.bz2 | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/config.mk')
| -rw-r--r-- | arch/arm/config.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/config.mk b/arch/arm/config.mk index a0c89b7..e7839be 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 |