random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

arch: Move NEEDS_MANUAL_RELOC symbol to Kconfig

Browse Source 
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>
This commit is contained in:
Michal Simek 2020-11-04 15:33:20 +01:00 committed by Tom Rini
parent 46ce9e777c
commit 35b7ca768f
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/Kconfig
View File

@ -4,6 +4,9 @@ config CREATE_ARCH_SYMLINK
config HAVE_ARCH_IOREMAP config HAVE_ARCH_IOREMAP
bool bool
config NEEDS_MANUAL_RELOC
bool
choice choice
prompt "Architecture select" prompt "Architecture select"
default SANDBOX default SANDBOX
@ -26,12 +29,14 @@ config ARM
config M68K config M68K
bool "M68000 architecture" bool "M68000 architecture"
select HAVE_PRIVATE_LIBGCC select HAVE_PRIVATE_LIBGCC
select NEEDS_MANUAL_RELOC
select SYS_BOOT_GET_CMDLINE select SYS_BOOT_GET_CMDLINE
select SYS_BOOT_GET_KBD select SYS_BOOT_GET_KBD
select SUPPORT_OF_CONTROL select SUPPORT_OF_CONTROL
config MICROBLAZE config MICROBLAZE
bool "MicroBlaze architecture" bool "MicroBlaze architecture"
select NEEDS_MANUAL_RELOC
select SUPPORT_OF_CONTROL select SUPPORT_OF_CONTROL
imply CMD_IRQ imply CMD_IRQ

2
arch/m68k/include/asm/config.h
View File

@ -6,8 +6,6 @@
#ifndef _ASM_CONFIG_H_ #ifndef _ASM_CONFIG_H_
#define _ASM_CONFIG_H_ #define _ASM_CONFIG_H_
#define CONFIG_NEEDS_MANUAL_RELOC
#define CONFIG_LMB #define CONFIG_LMB
#define CONFIG_SYS_BOOT_RAMDISK_HIGH #define CONFIG_SYS_BOOT_RAMDISK_HIGH

4
arch/microblaze/include/asm/config.h
View File

@ -8,10 +8,6 @@
#define CONFIG_LMB #define CONFIG_LMB
#ifndef CONFIG_SPL_BUILD
#define CONFIG_NEEDS_MANUAL_RELOC
#endif
#define CONFIG_SYS_BOOT_RAMDISK_HIGH #define CONFIG_SYS_BOOT_RAMDISK_HIGH
#endif #endif

1
scripts/config_whitelist.txt
View File

@ -1154,7 +1154,6 @@ CONFIG_NCEL2C100_BASE
CONFIG_NCEMIC100_BASE CONFIG_NCEMIC100_BASE
CONFIG_NDS_DLM1_BASE CONFIG_NDS_DLM1_BASE
CONFIG_NDS_DLM2_BASE CONFIG_NDS_DLM2_BASE
CONFIG_NEEDS_MANUAL_RELOC
CONFIG_NEO CONFIG_NEO
CONFIG_NET2BIG_V2 CONFIG_NET2BIG_V2
CONFIG_NETCONSOLE_BUFFER_SIZE CONFIG_NETCONSOLE_BUFFER_SIZE