| Message ID | 20220323212009.1066483-8-trini@konsulko.com |
|---|---|
| State | Accepted |
| Commit | c6c0e56ff8573faa1097e28a53162907c7bea186 |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [01/22] Convert CONFIG_CF_DSPI to Kconfig | expand |
> > 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> > --- > arch/Kconfig | 2 ++ > arch/arm/Kconfig | 1 - > arch/arm/mach-kirkwood/Kconfig | 1 - > arch/arm/mach-socfpga/Kconfig | 2 -- > arch/powerpc/cpu/mpc83xx/Kconfig | 1 - > arch/powerpc/cpu/mpc85xx/Kconfig | 1 - > 6 files changed, 2 insertions(+), 6 deletions(-) > Reviewed-by: Holger Brunck <holger.brunck@hitachienergy.com>
diff --git a/arch/Kconfig b/arch/Kconfig index 1b35fda64cc8..1d829ddf9945 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -447,3 +447,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 474ce4a555e4..b5ca14f041ad 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 382b8362674c..ca2da003b65b 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 bddfd44427ae..78a7549a4106 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 bcd837508789..52bc8cf750f8 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 509f356e4961..6c536b3c6b2d 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
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> --- arch/Kconfig | 2 ++ arch/arm/Kconfig | 1 - arch/arm/mach-kirkwood/Kconfig | 1 - arch/arm/mach-socfpga/Kconfig | 2 -- arch/powerpc/cpu/mpc83xx/Kconfig | 1 - arch/powerpc/cpu/mpc85xx/Kconfig | 1 - 6 files changed, 2 insertions(+), 6 deletions(-)