arch: Move NEEDS_MANUAL_RELOC symbol to Kconfig

CONFIG_NEEDS_MANUAL_RELOC macro was out of Kconfig. Move it there to be
able to use compile-time checks to reduce the number of build paths.

Fixes: f9a882438966 ("dm: core: Convert #ifdef to if() in root.c") for Microblaze
Reviewed-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/arch/Kconfig b/arch/Kconfig
index 683e38431906f27449ae0299b8a508d935a0b36e..3b9fcce980abea998ad5afa039e798f5df754b52 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -4,6 +4,9 @@ config CREATE_ARCH_SYMLINK
 config HAVE_ARCH_IOREMAP
        bool
 
+config NEEDS_MANUAL_RELOC
+       bool
+
 choice
        prompt "Architecture select"
        default SANDBOX
@@ -26,12 +29,14 @@ config ARM
 config M68K
        bool "M68000 architecture"
        select HAVE_PRIVATE_LIBGCC
+       select NEEDS_MANUAL_RELOC
        select SYS_BOOT_GET_CMDLINE
        select SYS_BOOT_GET_KBD
        select SUPPORT_OF_CONTROL
 
 config MICROBLAZE
        bool "MicroBlaze architecture"
+       select NEEDS_MANUAL_RELOC
        select SUPPORT_OF_CONTROL
        imply CMD_IRQ
 

diff --git a/arch/m68k/include/asm/config.h b/arch/m68k/include/asm/config.h
index c7363c0b511325db92004849cf5dead49e472bb2..7ea443673ad532676fea6b47e81456129fc7b3be 100644 (file)
--- a/arch/m68k/include/asm/config.h
+++ b/arch/m68k/include/asm/config.h
@@ -6,8 +6,6 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#define CONFIG_NEEDS_MANUAL_RELOC
-
 #define CONFIG_LMB
 #define CONFIG_SYS_BOOT_RAMDISK_HIGH
 

diff --git a/arch/microblaze/include/asm/config.h b/arch/microblaze/include/asm/config.h
index 112427291526fba3acab1fe4054a3c23918ea1d5..3ae71b3e010f941ebd0eff7d96fe71a0f8f8a923 100644 (file)
--- a/arch/microblaze/include/asm/config.h
+++ b/arch/microblaze/include/asm/config.h
@@ -8,10 +8,6 @@
 
 #define CONFIG_LMB
 
-#ifndef CONFIG_SPL_BUILD
-#define CONFIG_NEEDS_MANUAL_RELOC
-#endif
-
 #define CONFIG_SYS_BOOT_RAMDISK_HIGH
 
 #endif

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index a9508448d43e51346f573d6ffe27de2d2f029e2c..0aabe7a4516525680463d1ba00090366a301d1ec 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1154,7 +1154,6 @@ CONFIG_NCEL2C100_BASE
 CONFIG_NCEMIC100_BASE
 CONFIG_NDS_DLM1_BASE
 CONFIG_NDS_DLM2_BASE
-CONFIG_NEEDS_MANUAL_RELOC
 CONFIG_NEO
 CONFIG_NET2BIG_V2
 CONFIG_NETCONSOLE_BUFFER_SIZE