[PATCH] xilinx: kconfig: Move sourcing of board Kconfig to mach folders

classic Classic list List threaded Threaded
2 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] xilinx: kconfig: Move sourcing of board Kconfig to mach folders

Michal Simek-3
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 <[hidden email]>
---

 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

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] xilinx: kconfig: Move sourcing of board Kconfig to mach folders

Michal Simek-4
čt 27. 8. 2020 v 15:39 odesílatel Michal Simek <[hidden email]> 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 <[hidden email]>
> ---
>
>  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


--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Xilinx Microblaze
Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP ARM64 SoCs
U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal SoCs