diff options
| author | Tom Rini <trini@konsulko.com> | 2022-03-23 17:19:55 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-04-01 10:28:46 -0400 |
| commit | c6c0e56ff8573faa1097e28a53162907c7bea186 (patch) | |
| tree | c9b0b81c344f22ac019a47f8e34b43db138e74a8 | |
| parent | a8a326e62d01cf958d7f8746572788e760d542ae (diff) | |
| download | u-boot-c6c0e56ff8573faa1097e28a53162907c7bea186.zip u-boot-c6c0e56ff8573faa1097e28a53162907c7bea186.tar.gz u-boot-c6c0e56ff8573faa1097e28a53162907c7bea186.tar.bz2 | |
keymile: Move sourcing of common Kconfig
The way board/keymile/Kconfig is written protects the options there from
being parsed on non-keymile platforms. We cannot however safely source
this file from multiple locations. This does not manifest as a problem
currently as there are no choice statements inside of this file (nor the
sub-Kconfig files it sources). However, moving some target selection to
one of these files exposes the underlying problem. Rework things so
that we have this file sourced in arch/Kconfig.
Cc: Holger Brunck <holger.brunck@hitachienergy.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Holger Brunck <holger.brunck@hitachienergy.com>
| -rw-r--r-- | arch/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/Kconfig | 2 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc83xx/Kconfig | 1 | ||||
| -rw-r--r-- | arch/powerpc/cpu/mpc85xx/Kconfig | 1 |
6 files changed, 2 insertions, 6 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index 8450fdb..bc31e5a 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -448,3 +448,5 @@ source "arch/sh/Kconfig" source "arch/x86/Kconfig" source "arch/xtensa/Kconfig" source "arch/riscv/Kconfig" + +source "board/keymile/Kconfig" diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 474ce4a..b5ca14f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -2280,7 +2280,6 @@ source "board/vscom/baltos/Kconfig" source "board/phytium/durian/Kconfig" source "board/phytium/pomelo/Kconfig" source "board/xen/xenguest_arm64/Kconfig" -source "board/keymile/Kconfig" source "arch/arm/Kconfig.debug" diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig index 382b836..ca2da00 100644 --- a/arch/arm/mach-kirkwood/Kconfig +++ b/arch/arm/mach-kirkwood/Kconfig @@ -131,7 +131,6 @@ source "board/cloudengines/pogo_e02/Kconfig" source "board/cloudengines/pogo_v4/Kconfig" source "board/d-link/dns325/Kconfig" source "board/iomega/iconnect/Kconfig" -source "board/keymile/Kconfig" source "board/LaCie/net2big_v2/Kconfig" source "board/LaCie/netspace_v2/Kconfig" source "board/raidsonic/ib62x0/Kconfig" diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig index bddfd44..78a7549 100644 --- a/arch/arm/mach-socfpga/Kconfig +++ b/arch/arm/mach-socfpga/Kconfig @@ -248,6 +248,4 @@ config SYS_CONFIG_NAME default "socfpga_stratix10_socdk" if TARGET_SOCFPGA_STRATIX10_SOCDK default "socfpga_vining_fpga" if TARGET_SOCFPGA_SOFTING_VINING_FPGA -source "board/keymile/Kconfig" - endif diff --git a/arch/powerpc/cpu/mpc83xx/Kconfig b/arch/powerpc/cpu/mpc83xx/Kconfig index bcd8375..52bc8cf 100644 --- a/arch/powerpc/cpu/mpc83xx/Kconfig +++ b/arch/powerpc/cpu/mpc83xx/Kconfig @@ -200,7 +200,6 @@ config FSL_ELBC source "board/freescale/mpc837xerdb/Kconfig" source "board/ids/ids8313/Kconfig" -source "board/keymile/Kconfig" source "board/gdsys/mpc8308/Kconfig" endmenu diff --git a/arch/powerpc/cpu/mpc85xx/Kconfig b/arch/powerpc/cpu/mpc85xx/Kconfig index 509f356..6c536b3 100644 --- a/arch/powerpc/cpu/mpc85xx/Kconfig +++ b/arch/powerpc/cpu/mpc85xx/Kconfig @@ -1193,7 +1193,6 @@ source "board/freescale/t104xrdb/Kconfig" source "board/freescale/t208xqds/Kconfig" source "board/freescale/t208xrdb/Kconfig" source "board/freescale/t4rdb/Kconfig" -source "board/keymile/Kconfig" source "board/socrates/Kconfig" endmenu |