| Message ID | f91fa0ad6440f14e0bf490bfdac066e9d98994be.1598535568.git.michal.simek@xilinx.com |
|---|---|
| State | Deferred |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | xilinx: kconfig: Move sourcing of board Kconfig to mach folders | expand |
čt 27. 8. 2020 v 15:39 odesílatel Michal Simek <michal.simek@xilinx.com> napsal: > > Do not source xilinx board Kconfig by other boards. These configs should be > available only when Xilinx platforms are selected. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> > --- > > arch/arm/Kconfig | 4 ---- > arch/arm/mach-versal/Kconfig | 3 +++ > arch/arm/mach-zynq/Kconfig | 3 +++ > arch/arm/mach-zynqmp/Kconfig | 3 +++ > 4 files changed, 9 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig > index 80702c23d345..df4bbd252aca 100644 > --- a/arch/arm/Kconfig > +++ b/arch/arm/Kconfig > @@ -1997,10 +1997,6 @@ source "board/tcl/sl50/Kconfig" > source "board/toradex/colibri_pxa270/Kconfig" > source "board/variscite/dart_6ul/Kconfig" > source "board/vscom/baltos/Kconfig" > -source "board/xilinx/Kconfig" > -source "board/xilinx/zynq/Kconfig" > -source "board/xilinx/zynqmp/Kconfig" > -source "board/xilinx/versal/Kconfig" > source "board/phytium/durian/Kconfig" > source "board/xen/xenguest_arm64/Kconfig" > > diff --git a/arch/arm/mach-versal/Kconfig b/arch/arm/mach-versal/Kconfig > index e1d66e8d32b7..ebd2da3887ec 100644 > --- a/arch/arm/mach-versal/Kconfig > +++ b/arch/arm/mach-versal/Kconfig > @@ -62,4 +62,7 @@ config VERSAL_NO_DDR > This option configures MMU with no DDR to avoid speculative > access to DDR memory where DDR is not present. > > +source "board/xilinx/Kconfig" > +source "board/xilinx/versal/Kconfig" > + > endif > diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig > index 79f831e6df2c..e54310383b29 100644 > --- a/arch/arm/mach-zynq/Kconfig > +++ b/arch/arm/mach-zynq/Kconfig > @@ -70,4 +70,7 @@ config BOOT_INIT_FILE > config ZYNQ_SDHCI_MAX_FREQ > default 52000000 > > +source "board/xilinx/Kconfig" > +source "board/xilinx/zynq/Kconfig" > + > endif > diff --git a/arch/arm/mach-zynqmp/Kconfig b/arch/arm/mach-zynqmp/Kconfig > index d82a737a699e..f1301f6661a1 100644 > --- a/arch/arm/mach-zynqmp/Kconfig > +++ b/arch/arm/mach-zynqmp/Kconfig > @@ -171,4 +171,7 @@ config SD1_LSHFT_MODE > > endchoice > > +source "board/xilinx/Kconfig" > +source "board/xilinx/zynqmp/Kconfig" > + > endif > -- > 2.28.0 > Applied with syncing defconfigs. M
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 80702c23d345..df4bbd252aca 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1997,10 +1997,6 @@ source "board/tcl/sl50/Kconfig" source "board/toradex/colibri_pxa270/Kconfig" source "board/variscite/dart_6ul/Kconfig" source "board/vscom/baltos/Kconfig" -source "board/xilinx/Kconfig" -source "board/xilinx/zynq/Kconfig" -source "board/xilinx/zynqmp/Kconfig" -source "board/xilinx/versal/Kconfig" source "board/phytium/durian/Kconfig" source "board/xen/xenguest_arm64/Kconfig" diff --git a/arch/arm/mach-versal/Kconfig b/arch/arm/mach-versal/Kconfig index e1d66e8d32b7..ebd2da3887ec 100644 --- a/arch/arm/mach-versal/Kconfig +++ b/arch/arm/mach-versal/Kconfig @@ -62,4 +62,7 @@ config VERSAL_NO_DDR This option configures MMU with no DDR to avoid speculative access to DDR memory where DDR is not present. +source "board/xilinx/Kconfig" +source "board/xilinx/versal/Kconfig" + endif diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig index 79f831e6df2c..e54310383b29 100644 --- a/arch/arm/mach-zynq/Kconfig +++ b/arch/arm/mach-zynq/Kconfig @@ -70,4 +70,7 @@ config BOOT_INIT_FILE config ZYNQ_SDHCI_MAX_FREQ default 52000000 +source "board/xilinx/Kconfig" +source "board/xilinx/zynq/Kconfig" + endif diff --git a/arch/arm/mach-zynqmp/Kconfig b/arch/arm/mach-zynqmp/Kconfig index d82a737a699e..f1301f6661a1 100644 --- a/arch/arm/mach-zynqmp/Kconfig +++ b/arch/arm/mach-zynqmp/Kconfig @@ -171,4 +171,7 @@ config SD1_LSHFT_MODE endchoice +source "board/xilinx/Kconfig" +source "board/xilinx/zynqmp/Kconfig" + endif
Do not source xilinx board Kconfig by other boards. These configs should be available only when Xilinx platforms are selected. Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- arch/arm/Kconfig | 4 ---- arch/arm/mach-versal/Kconfig | 3 +++ arch/arm/mach-zynq/Kconfig | 3 +++ arch/arm/mach-zynqmp/Kconfig | 3 +++ 4 files changed, 9 insertions(+), 4 deletions(-)