diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2020-11-04 15:33:20 +0100 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-11-04 10:13:44 -0500 |
| commit | 35b7ca768f7d826b77d5d3d6ccd6b1b8ed21f186 (patch) | |
| tree | d8274d6ddd3c681f4b142f13decd23fe04e665ac | |
| parent | 46ce9e777c1314ccb78906992b94001194eaa87b (diff) | |
| download | u-boot-WIP/04Nov2020.tar.gz | |
arch: Move NEEDS_MANUAL_RELOC symbol to KconfigWIP/04Nov2020
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>
| -rw-r--r-- | arch/Kconfig | 5 | ||||
| -rw-r--r-- | arch/m68k/include/asm/config.h | 2 | ||||
| -rw-r--r-- | arch/microblaze/include/asm/config.h | 4 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
4 files changed, 5 insertions, 7 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index 683e384319..3b9fcce980 100644 --- 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 c7363c0b51..7ea443673a 100644 --- 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 1124272915..3ae71b3e01 100644 --- 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 a9508448d4..0aabe7a451 100644 --- 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 |