arch: Move NEEDS_MANUAL_RELOC symbol to Kconfig
Subsystems (2)
PATCH 1/1 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.
---
arch/Kconfig | 5 +++++ arch/m68k/include/asm/config.h | 2 -- arch/microblaze/include/asm/config.h | 4 ---- scripts/config_whitelist.txt | 1 - 4 files changed, 5 insertions(+), 7 deletions(-)
arch/Kconfig +5 -0
@@ -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
arch/m68k/include/asm/config.h +0 -2
@@ -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
arch/microblaze/include/asm/config.h +0 -4
@@ -8,10 +8,6 @@#define CONFIG_LMB -#ifndef CONFIG_SPL_BUILD -#define CONFIG_NEEDS_MANUAL_RELOC -#endif -#define CONFIG_SYS_BOOT_RAMDISK_HIGH #endif
scripts/config_whitelist.txt +0 -1
@@ -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
Signature · 1 line
2.29.2
PATCH 1/1 arch: Move NEEDS_MANUAL_RELOC symbol to Kconfig
Quoted 5 lines · Michal Simek
CONFIG_NEEDS_MANUAL_RELOCmacro was out ofKconfig. 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 MicroblazeSigned-off-by Michal Simek <[email protected]>
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201104/076ebcb0/attachment.sig>
PATCH 1/1 arch: Move NEEDS_MANUAL_RELOC symbol to Kconfig
Quoted 6 lines · Tom Rini
Quoted 4 lines · Michal Simek
CONFIG_NEEDS_MANUAL_RELOCmacro was out ofKconfig. Move it there to be able to use compile-time checks to reduce the number of build paths.
Quoted 6 lines
Quoted 3 lines
Fixes f9a882438966 ("dm: core: Convert #ifdef to if() in
root.c") for Microblaze Signed-off-by: Michal Simek <[email protected]>Reviewed-by Tom Rini <[email protected]>
Thx. Can you please take it directly to your tree to fix booting issue on Microblaze. I would expect m68k won't be able to boot too.
Thanks,
Michal
PATCH 1/1 arch: Move NEEDS_MANUAL_RELOC symbol to Kconfig
Quoted 13 lines · Michal Simek
Quoted 10 lines · Tom Rini
Quoted 7 lines · Michal Simek
CONFIG_NEEDS_MANUAL_RELOCmacro was out ofKconfig. 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 Signed-off-by: Michal Simek <[email protected]>
Quoted 5 lines
Quoted 2 lines
Reviewed-by Tom Rini <[email protected]>Thx. Can you please take it directly to your tree to fix booting issue on Microblaze. I would expect m68k won't be able to boot too.
OK, will do shortly. Thanks.
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201104/4bc3811c/attachment.sig>
PATCH 1/1 arch: Move NEEDS_MANUAL_RELOC symbol to Kconfig
In reply to Michal SimekQuoted 6 lines · Michal Simek
CONFIG_NEEDS_MANUAL_RELOCmacro was out ofKconfig. 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 MicroblazeSigned-off-by Michal Simek <[email protected]>Reviewed-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201104/34934e2f/attachment.sig>