* [PATCH] arch: Move NEEDS_MANUAL_RELOC symbol to Kconfig
@ 2020-11-04 14:33 Michal Simek
2020-11-04 14:45 ` Tom Rini
2020-11-04 22:53 ` Tom Rini
0 siblings, 2 replies; 5+ messages in thread
From: Michal Simek @ 2020-11-04 14:33 UTC (permalink / raw)
To: u-boot
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
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---
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(-)
diff --git a/arch/Kconfig b/arch/Kconfig
index 683e38431906..3b9fcce980ab 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 c7363c0b5113..7ea443673ad5 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 112427291526..3ae71b3e010f 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 a9508448d43e..0aabe7a45165 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
--
2.29.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH] arch: Move NEEDS_MANUAL_RELOC symbol to Kconfig
2020-11-04 14:33 [PATCH] arch: Move NEEDS_MANUAL_RELOC symbol to Kconfig Michal Simek
@ 2020-11-04 14:45 ` Tom Rini
2020-11-04 14:55 ` Michal Simek
2020-11-04 22:53 ` Tom Rini
1 sibling, 1 reply; 5+ messages in thread
From: Tom Rini @ 2020-11-04 14:45 UTC (permalink / raw)
To: u-boot
On Wed, Nov 04, 2020 at 03:33:20PM +0100, Michal Simek wrote:
> 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
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
--
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>
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH] arch: Move NEEDS_MANUAL_RELOC symbol to Kconfig
2020-11-04 14:45 ` Tom Rini
@ 2020-11-04 14:55 ` Michal Simek
2020-11-04 15:13 ` Tom Rini
0 siblings, 1 reply; 5+ messages in thread
From: Michal Simek @ 2020-11-04 14:55 UTC (permalink / raw)
To: u-boot
On 04. 11. 20 15:45, Tom Rini wrote:
> On Wed, Nov 04, 2020 at 03:33:20PM +0100, Michal Simek wrote:
>
>> 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 Signed-off-by: Michal Simek
>> <michal.simek@xilinx.com>
>
> Reviewed-by: Tom Rini <trini@konsulko.com>
>
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
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH] arch: Move NEEDS_MANUAL_RELOC symbol to Kconfig
2020-11-04 14:55 ` Michal Simek
@ 2020-11-04 15:13 ` Tom Rini
0 siblings, 0 replies; 5+ messages in thread
From: Tom Rini @ 2020-11-04 15:13 UTC (permalink / raw)
To: u-boot
On Wed, Nov 04, 2020 at 03:55:51PM +0100, Michal Simek wrote:
>
>
> On 04. 11. 20 15:45, Tom Rini wrote:
> > On Wed, Nov 04, 2020 at 03:33:20PM +0100, Michal Simek wrote:
> >
> >> 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 Signed-off-by: Michal Simek
> >> <michal.simek@xilinx.com>
> >
> > Reviewed-by: Tom Rini <trini@konsulko.com>
> >
>
> 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.
--
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>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] arch: Move NEEDS_MANUAL_RELOC symbol to Kconfig
2020-11-04 14:33 [PATCH] arch: Move NEEDS_MANUAL_RELOC symbol to Kconfig Michal Simek
2020-11-04 14:45 ` Tom Rini
@ 2020-11-04 22:53 ` Tom Rini
1 sibling, 0 replies; 5+ messages in thread
From: Tom Rini @ 2020-11-04 22:53 UTC (permalink / raw)
To: u-boot
On Wed, Nov 04, 2020 at 03:33:20PM +0100, Michal Simek wrote:
> 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
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> Reviewed-by: Tom Rini <trini@konsulko.com>
Applied to u-boot/master, thanks!
--
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>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-11-04 22:53 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-11-04 14:33 [PATCH] arch: Move NEEDS_MANUAL_RELOC symbol to Kconfig Michal Simek
2020-11-04 14:45 ` Tom Rini
2020-11-04 14:55 ` Michal Simek
2020-11-04 15:13 ` Tom Rini
2020-11-04 22:53 ` Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox