Convert CONFIG_STANDALONE_LOAD_ADDR to Kconfig

This converts the following to Kconfig:
   CONFIG_STANDALONE_LOAD_ADDR

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/README b/README
index 3ebee1cb3755a5b0fdba3a6a939686b3c4d16707..c8f6b21e2d96513fad6ed5c5a7374e47908dc76f 100644 (file)
--- a/README
+++ b/README
@@ -1166,13 +1166,6 @@ The following options need to be configured:
                this is instead controlled by the value of
                /config/load-environment.
 
-               CONFIG_STANDALONE_LOAD_ADDR
-
-               This option defines a board specific value for the
-               address where standalone program gets loaded, thus
-               overwriting the architecture dependent default
-               settings.
-
 - Automatic software updates via TFTP server
                CONFIG_UPDATE_TFTP
                CONFIG_UPDATE_TFTP_CNT_MAX

diff --git a/api/Kconfig b/api/Kconfig
index eb8d5d0596a79498cf562a639c3008010142a413..d9362724e5f613d999b2a62ac899f7e64a8dc109 100644 (file)
--- a/api/Kconfig
+++ b/api/Kconfig
@@ -11,3 +11,22 @@ config SYS_MMC_MAX_DEVICE
        default 1
 
 endmenu
+
+config STANDALONE_LOAD_ADDR
+       hex "Address in memory to link standalone applications to"
+       default 0xffffffff80200000 if MIPS && 64BIT
+       default 0x8c000000 if SH
+       default 0x82000000 if ARC
+       default 0x80f00000 if MICROBLAZE
+       default 0x80300000 if ARCH_OMAP2PLUS || FSL_LSCH2 || FSL_LSCH3
+       default 0x80200000 if MIPS && 32BIT
+       default 0x0c100000 if ARM
+       default 0x02000000 if NIOS2
+       default 0x00040000 if PPC || X86
+       default 0x00020000 if M68K
+       default 0x0 if RISCV
+       default SYS_LOAD_ADDR
+       help
+         This option defines a board specific value for the address where
+         standalone program gets loaded, thus overwriting the architecture
+         dependent default settings.

diff --git a/arch/arc/config.mk b/arch/arc/config.mk
index 2b70945ac342cf1bfe7902fa7832dd54a90b48a0..b713fa3054c00acf7f16f79222160c9646b9ce9f 100644 (file)
--- a/arch/arc/config.mk
+++ b/arch/arc/config.mk
@@ -21,6 +21,3 @@ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections -fno-common
 
 # Needed for relocation
 LDFLAGS_FINAL += -pie --gc-sections
-
-# Load address for standalone apps
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x82000000

diff --git a/arch/arm/config.mk b/arch/arm/config.mk
index 2065438d0530fb89cd6d01943c1361127cd862b7..bf781f102620f0ab9e28d64a908dd60d21840317 100644 (file)
--- a/arch/arm/config.mk
+++ b/arch/arm/config.mk
@@ -3,14 +3,6 @@
 # (C) Copyright 2000-2002
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 
-ifndef CONFIG_STANDALONE_LOAD_ADDR
-ifneq ($(CONFIG_ARCH_OMAP2PLUS),)
-CONFIG_STANDALONE_LOAD_ADDR = 0x80300000
-else
-CONFIG_STANDALONE_LOAD_ADDR = 0xc100000
-endif
-endif
-
 CFLAGS_NON_EFI := -fno-pic -ffixed-r9 -ffunction-sections -fdata-sections \
                  -fstack-protector-strong
 CFLAGS_EFI := -fpic -fshort-wchar

diff --git a/arch/arm/include/asm/arch-fsl-layerscape/config.h b/arch/arm/include/asm/arch-fsl-layerscape/config.h
index c9c72e3271727b8dfe756d91bbf0649a1b17da51..57d92f65520daa22fa7253a91aec57f1db468c10 100644 (file)
--- a/arch/arm/include/asm/arch-fsl-layerscape/config.h
+++ b/arch/arm/include/asm/arch-fsl-layerscape/config.h
@@ -14,8 +14,6 @@
 #include <linux/bitops.h>
 #endif
 
-#define CONFIG_STANDALONE_LOAD_ADDR    0x80300000
-
 /*
  * Reserve secure memory
  * To be aligned with MMU block size

diff --git a/arch/m68k/config.mk b/arch/m68k/config.mk
index ed592334af2e437dfaf8ebdf9f2ef544a5b48f8d..3ccbe49220213abc639c62a0d9db149d79c0c3c3 100644 (file)
--- a/arch/m68k/config.mk
+++ b/arch/m68k/config.mk
@@ -3,8 +3,6 @@
 # (C) Copyright 2000-2002
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x20000
-
 PLATFORM_CPPFLAGS += -D__M68K__
 KBUILD_LDFLAGS  += -n
 PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections

diff --git a/arch/microblaze/config.mk b/arch/microblaze/config.mk
index d35b4f6db7a1b33d91f90b6f5673f1205620a826..467c5ca1b12f852659800c53eaa29af3ff7255ee 100644 (file)
--- a/arch/microblaze/config.mk
+++ b/arch/microblaze/config.mk
@@ -6,8 +6,6 @@
 # (C) Copyright 2004 Atmark Techno, Inc.
 # Yasushi SHOJI <yashi@atmark-techno.com>
 
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x80F00000
-
 PLATFORM_CPPFLAGS += -ffixed-r31 -D__microblaze__
 PLATFORM_CPPFLAGS += -fdata-sections -ffunction-sections
 

diff --git a/arch/mips/config.mk b/arch/mips/config.mk
index 04f362780580a3859b4671a77bf125e212f583f0..745f03190e982662f2547c9ecd1b56461cf331a7 100644 (file)
--- a/arch/mips/config.mk
+++ b/arch/mips/config.mk
@@ -25,14 +25,12 @@ ifdef CONFIG_32BIT
 PLATFORM_CPPFLAGS      += -mabi=32
 KBUILD_LDFLAGS         += -m $(32bit-emul)
 OBJCOPYFLAGS           += -O $(32bit-bfd)
-CONFIG_STANDALONE_LOAD_ADDR    ?= 0x80200000
 endif
 
 ifdef CONFIG_64BIT
 PLATFORM_CPPFLAGS      += -mabi=64
 KBUILD_LDFLAGS         += -m$(64bit-emul)
 OBJCOPYFLAGS           += -O $(64bit-bfd)
-CONFIG_STANDALONE_LOAD_ADDR    ?= 0xffffffff80200000
 endif
 
 PLATFORM_CPPFLAGS += -D__MIPS__

diff --git a/arch/nios2/config.mk b/arch/nios2/config.mk
index 44260b1431cb8c865a99571875b90c370b3317cf..b18b9b78ab6d73cc92bf1f500c3142fb79295d88 100644 (file)
--- a/arch/nios2/config.mk
+++ b/arch/nios2/config.mk
@@ -4,8 +4,6 @@
 # Psyent Corporation <www.psyent.com>
 # Scott McNutt <smcnutt@psyent.com>
 
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x02000000
-
 PLATFORM_CPPFLAGS += -D__NIOS2__
 PLATFORM_CPPFLAGS += -G0
 

diff --git a/arch/powerpc/config.mk b/arch/powerpc/config.mk
index 307ca65745c8615445e6d148a9c87468d6dbd10f..725a4f48aad6a2d18b93f51b86e408c6dbe78165 100644 (file)
--- a/arch/powerpc/config.mk
+++ b/arch/powerpc/config.mk
@@ -3,7 +3,6 @@
 # (C) Copyright 2000-2010
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000
 LDFLAGS_FINAL += --gc-sections
 LDFLAGS_FINAL += --bss-plt
 PLATFORM_RELFLAGS += -fpic -mrelocatable -ffunction-sections \

diff --git a/arch/riscv/config.mk b/arch/riscv/config.mk
index 1ebce5bd674815be420b8817a3480af03024c77c..a8ed3faf28cd442454b889f5a9a085e4cdc0652b 100644 (file)
--- a/arch/riscv/config.mk
+++ b/arch/riscv/config.mk
@@ -23,8 +23,6 @@ KBUILD_LDFLAGS                += -m $(64bit-emul)
 EFI_LDS                        := elf_riscv64_efi.lds
 endif
 
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000
-
 PLATFORM_CPPFLAGS      += -ffixed-gp -fpic
 PLATFORM_RELFLAGS      += -fno-common -gdwarf-2 -ffunction-sections \
                           -fdata-sections

diff --git a/arch/sh/config.mk b/arch/sh/config.mk
index 78bb2660e1e340f2dcec1908b9c4f03ee3239879..a408264d4b1116da66220dfcf72e410dd9ec521c 100644 (file)
--- a/arch/sh/config.mk
+++ b/arch/sh/config.mk
@@ -3,7 +3,6 @@
 # (C) Copyright 2000-2002
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x8C000000
 ifeq ($(CPU),sh2)
 LDFLAGS_STANDALONE += -EB
 endif

diff --git a/arch/x86/config.mk b/arch/x86/config.mk
index 889497b6bd759bf93a84775efafb5646e8dc430f..a4a694ddf3137ee99dc1e4ce55596f629014340e 100644 (file)
--- a/arch/x86/config.mk
+++ b/arch/x86/config.mk
@@ -3,8 +3,6 @@
 # (C) Copyright 2000-2002
 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
 
-CONFIG_STANDALONE_LOAD_ADDR ?= 0x40000
-
 PLATFORM_CPPFLAGS += -fomit-frame-pointer
 PF_CPPFLAGS_X86   := $(call cc-option, -fno-toplevel-reorder, \
                     $(call cc-option, -fno-unit-at-a-time))

diff --git a/configs/display5_defconfig b/configs/display5_defconfig
index dbd917b4ddb94a46aa8dfa06f88223c2f3607ba8..c46a0a0b6992549c89d6dc5a7e22ab5b9526ec53 100644 (file)
--- a/configs/display5_defconfig
+++ b/configs/display5_defconfig
@@ -30,6 +30,7 @@ CONFIG_ENV_OFFSET_REDUND=0x130000
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI=y
 CONFIG_SYS_MONITOR_LEN=409600
+CONFIG_STANDALONE_LOAD_ADDR=0x10001000
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set

diff --git a/configs/display5_factory_defconfig b/configs/display5_factory_defconfig
index 7508702eb95a035067ff908f862da911de254f44..cacdf33d53e6e2975c4dad679161654be8ddc645 100644 (file)
--- a/configs/display5_factory_defconfig
+++ b/configs/display5_factory_defconfig
@@ -27,6 +27,7 @@ CONFIG_ENV_OFFSET_REDUND=0x130000
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI=y
 CONFIG_SYS_MONITOR_LEN=409600
+CONFIG_STANDALONE_LOAD_ADDR=0x10001000
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT=y
 # CONFIG_USE_SPL_FIT_GENERATOR is not set

diff --git a/configs/microchip_mpfs_icicle_defconfig b/configs/microchip_mpfs_icicle_defconfig
index fbb2df4a749c18dc25d96fdd4cff21bf26e920c5..c2b938e7e7e9fa557ba3a189222cd2c1b28c8cd9 100644 (file)
--- a/configs/microchip_mpfs_icicle_defconfig
+++ b/configs/microchip_mpfs_icicle_defconfig
@@ -12,6 +12,7 @@ CONFIG_RISCV_SMODE=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
+CONFIG_STANDALONE_LOAD_ADDR=0x80200000
 CONFIG_FIT=y
 CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y

diff --git a/configs/qemu-riscv32_defconfig b/configs/qemu-riscv32_defconfig
index 425bb37c9883d60f2809f343d9f8b2aad93f30f7..844c95380e6470ad3c265ca550d5836800c1f837 100644 (file)
--- a/configs/qemu-riscv32_defconfig
+++ b/configs/qemu-riscv32_defconfig
@@ -9,6 +9,7 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
 CONFIG_SYS_MONITOR_LEN=786432
+CONFIG_STANDALONE_LOAD_ADDR=0x80200000
 CONFIG_FIT=y
 CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y

diff --git a/configs/qemu-riscv32_smode_defconfig b/configs/qemu-riscv32_smode_defconfig
index eeb90360cdbbb4e1c930626cc069539770570162..2be349ada768fb2631cd25fccc362e9eb60e80ef 100644 (file)
--- a/configs/qemu-riscv32_smode_defconfig
+++ b/configs/qemu-riscv32_smode_defconfig
@@ -10,6 +10,7 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
 CONFIG_SYS_MONITOR_LEN=786432
+CONFIG_STANDALONE_LOAD_ADDR=0x80200000
 CONFIG_FIT=y
 CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y

diff --git a/configs/qemu-riscv32_spl_defconfig b/configs/qemu-riscv32_spl_defconfig
index 04447e5ed3ca841b95ad89482cf97d9116484c36..894b6d5d17423adade171b3fccbad7d46a765eae 100644 (file)
--- a/configs/qemu-riscv32_spl_defconfig
+++ b/configs/qemu-riscv32_spl_defconfig
@@ -12,6 +12,7 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
 CONFIG_SYS_MONITOR_LEN=786432
+CONFIG_STANDALONE_LOAD_ADDR=0x80200000
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000
 CONFIG_DISPLAY_CPUINFO=y

diff --git a/configs/qemu-riscv64_defconfig b/configs/qemu-riscv64_defconfig
index 7430fa075d71c7604b020f2793441baba81024d1..8b558e6bc27cb9a19a1512a3d17f233eb26a584e 100644 (file)
--- a/configs/qemu-riscv64_defconfig
+++ b/configs/qemu-riscv64_defconfig
@@ -9,6 +9,7 @@ CONFIG_ARCH_RV64I=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
+CONFIG_STANDALONE_LOAD_ADDR=0x80200000
 CONFIG_FIT=y
 CONFIG_DISPLAY_CPUINFO=y
 CONFIG_DISPLAY_BOARDINFO=y

diff --git a/configs/qemu-riscv64_smode_defconfig b/configs/qemu-riscv64_smode_defconfig
index 03ef58ba47519aa4238220210835a94adb15dde3..6ed88de2342cb2c3982575c5af33aa9e7816ed2f 100644 (file)
--- a/configs/qemu-riscv64_smode_defconfig
+++ b/configs/qemu-riscv64_smode_defconfig
@@ -10,6 +10,7 @@ CONFIG_RISCV_SMODE=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
+CONFIG_STANDALONE_LOAD_ADDR=0x80200000
 CONFIG_FIT=y
 CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="setenv fdt_addr ${fdtcontroladdr}; fdt addr ${fdtcontroladdr};"

diff --git a/configs/qemu-riscv64_spl_defconfig b/configs/qemu-riscv64_spl_defconfig
index 840e0ff151ca29d0eb513d3a6a608a86ea6b14dd..adc6f730d2aeb397557a2f4b534c117d4a4bfe88 100644 (file)
--- a/configs/qemu-riscv64_spl_defconfig
+++ b/configs/qemu-riscv64_spl_defconfig
@@ -11,6 +11,7 @@ CONFIG_RISCV_SMODE=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
+CONFIG_STANDALONE_LOAD_ADDR=0x80200000
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT_ADDRESS=0x80200000
 CONFIG_DISPLAY_CPUINFO=y

diff --git a/configs/sifive_unleashed_defconfig b/configs/sifive_unleashed_defconfig
index 99faabaa2ff29577292d9e43f9eb6517f75271a1..6c85962cbb2ee0a66b44711186dd81fcfa378103 100644 (file)
--- a/configs/sifive_unleashed_defconfig
+++ b/configs/sifive_unleashed_defconfig
@@ -16,6 +16,7 @@ CONFIG_RISCV_SMODE=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
+CONFIG_STANDALONE_LOAD_ADDR=0x80200000
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT_ADDRESS=0x84000000
 CONFIG_USE_PREBOOT=y

diff --git a/configs/sifive_unmatched_defconfig b/configs/sifive_unmatched_defconfig
index c390af26897fb53c582649430cbc774075559dec..3d96aa5411915ccd4e043ec427a932453424690b 100644 (file)
--- a/configs/sifive_unmatched_defconfig
+++ b/configs/sifive_unmatched_defconfig
@@ -19,6 +19,7 @@ CONFIG_RISCV_SMODE=y
 CONFIG_DISTRO_DEFAULTS=y
 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y
 CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
+CONFIG_STANDALONE_LOAD_ADDR=0x80200000
 CONFIG_FIT=y
 CONFIG_SPL_LOAD_FIT_ADDRESS=0x84000000
 CONFIG_USE_PREBOOT=y

diff --git a/configs/xtfpga_defconfig b/configs/xtfpga_defconfig
index f5eeea426bb85fcad76099da7ebb1d55482c80ed..d3a350f54009492953185265cf5a3cd62a37ae62 100644 (file)
--- a/configs/xtfpga_defconfig
+++ b/configs/xtfpga_defconfig
@@ -9,6 +9,7 @@ CONFIG_SYS_LOAD_ADDR=0x02000000
 CONFIG_ENV_ADDR=0xF7FE0000
 CONFIG_XTFPGA_KC705=y
 CONFIG_SYS_MONITOR_LEN=262144
+CONFIG_STANDALONE_LOAD_ADDR=0x00800000
 CONFIG_SYS_MONITOR_BASE=0xF6000000
 CONFIG_DYNAMIC_SYS_CLK_FREQ=y
 CONFIG_SHOW_BOOT_PROGRESS=y

diff --git a/include/configs/display5.h b/include/configs/display5.h
index 5cbeb9224c36738395cb8c5bd3bed69d7bc20a0a..4401515a65ebe09967481aa7a06995ff1cae1639 100644 (file)
--- a/include/configs/display5.h
+++ b/include/configs/display5.h
@@ -276,8 +276,6 @@
 
 /* Miscellaneous configurable options */
 
-#define CONFIG_STANDALONE_LOAD_ADDR    0x10001000
-
 /* Physical Memory Map */
 #define PHYS_SDRAM                     MMDC0_ARB_BASE_ADDR
 #define CFG_SYS_SDRAM_BASE             PHYS_SDRAM

diff --git a/include/configs/microchip_mpfs_icicle.h b/include/configs/microchip_mpfs_icicle.h
index 3def93d61e8ae65c143daccf6a70b9009154cdde..c73c5a1d9fe02871d896c0868bf19ac8bd1d95bb 100644 (file)
--- a/include/configs/microchip_mpfs_icicle.h
+++ b/include/configs/microchip_mpfs_icicle.h
@@ -11,8 +11,6 @@
 
 #define CFG_SYS_SDRAM_BASE       0x80000000
 
-#define CONFIG_STANDALONE_LOAD_ADDR 0x80200000
-
 /* Environment options */
 
 #define BOOT_TARGET_DEVICES(func) \

diff --git a/include/configs/opos6uldev.h b/include/configs/opos6uldev.h
index 5c44b9dcb20d7470cdd2f14a83a959a88c081438..459134b93f8396f32c711992578abf3d424be25a 100644 (file)
--- a/include/configs/opos6uldev.h
+++ b/include/configs/opos6uldev.h
@@ -11,7 +11,6 @@
 #include "mx6_common.h"
 
 /* Miscellaneous configurable options */
-#define CONFIG_STANDALONE_LOAD_ADDR    CONFIG_SYS_LOAD_ADDR
 
 /* Physical Memory Map */
 #define CFG_SYS_SDRAM_BASE             MMDC0_ARB_BASE_ADDR

diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h
index 72f35cc05420fa71fdc863ef785b205050f339cd..35172da3ff1e18ee76cecb92bfb0d4015cc8386e 100644 (file)
--- a/include/configs/qemu-riscv.h
+++ b/include/configs/qemu-riscv.h
@@ -10,8 +10,6 @@
 
 #define CFG_SYS_SDRAM_BASE             0x80000000
 
-#define CONFIG_STANDALONE_LOAD_ADDR    0x80200000
-
 #define RISCV_MMODE_TIMERBASE          0x2000000
 #define RISCV_MMODE_TIMER_FREQ         1000000
 

diff --git a/include/configs/sifive-unleashed.h b/include/configs/sifive-unleashed.h
index 5ad2124bddab1a4300a141ee88860fb62a65ae00..4a453a9df4070d7219fd3e4fef37bdb08a515478 100644 (file)
--- a/include/configs/sifive-unleashed.h
+++ b/include/configs/sifive-unleashed.h
@@ -13,8 +13,6 @@
 
 #define CFG_SYS_SDRAM_BASE             0x80000000
 
-#define CONFIG_STANDALONE_LOAD_ADDR    0x80200000
-
 #define RISCV_MMODE_TIMERBASE          0x2000000
 #define RISCV_MMODE_TIMER_FREQ         1000000
 

diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h
index f4b1a16019ec23608b93e42c071aa80175d144ea..ac42108620faa017662554942a0ca43edd854109 100644 (file)
--- a/include/configs/sifive-unmatched.h
+++ b/include/configs/sifive-unmatched.h
@@ -13,8 +13,6 @@
 
 #define CFG_SYS_SDRAM_BASE             0x80000000
 
-#define CONFIG_STANDALONE_LOAD_ADDR    0x80200000
-
 /* Environment options */
 
 #define BOOT_TARGET_DEVICES(func) \

diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
index 496139f346359dc742e61b77a39dc9337f9a6643..5d82e7e560f6be0adb664e0eee1d468cbaf7c6e4 100644 (file)
--- a/include/configs/sunxi-common.h
+++ b/include/configs/sunxi-common.h
@@ -73,9 +73,6 @@
  * Miscellaneous configurable options
  */
 
-/* standalone support */
-#define CONFIG_STANDALONE_LOAD_ADDR    CONFIG_SYS_LOAD_ADDR
-
 /* FLASH and environment organization */
 
 /*

diff --git a/include/configs/xtfpga.h b/include/configs/xtfpga.h
index 9201dac7abce26e07a902236798c4aef28d2aad4..e0189c58f0427a03d06a34574cceace82e0dd8b9 100644 (file)
--- a/include/configs/xtfpga.h
+++ b/include/configs/xtfpga.h
@@ -53,22 +53,6 @@
 
 /* Memory test is destructive so default must not overlap vectors or U-Boot*/
 
-/* Load address for stand-alone applications.
- * MEMADDR cannot be used here, because the definition needs to be
- * a plain number as it's used as -Ttext argument for ld in standalone
- * example makefile.
- * Handle noMMU vs MMUv2 vs MMUv3 distinction here manually.
- */
-#if XCHAL_HAVE_PTP_MMU
-#if XCHAL_VECBASE_RESET_VADDR == XCHAL_VECBASE_RESET_PADDR
-#define CONFIG_STANDALONE_LOAD_ADDR    0x00800000
-#else
-#define CONFIG_STANDALONE_LOAD_ADDR    0xd0800000
-#endif
-#else
-#define CONFIG_STANDALONE_LOAD_ADDR    0x60800000
-#endif
-
 #if defined(CONFIG_MAX_MEM_MAPPED) && \
        CONFIG_MAX_MEM_MAPPED < CFG_SYS_SDRAM_SIZE
 #define XTENSA_SYS_TEXT_ADDR           \