Re: [PATCH RESEND 1/7] riscv: dts: Introduce SPL_LOAD_FIT_CONFIG symbol

2023-10-07 Thread Simon Glass
Hi Randoph,

On Fri, 6 Oct 2023 at 05:26, Randolph  wrote:
>
> Introduce common Kconfig symbol for riscv architecture
> This symbol SPL_LOAD_FIT_CONFIG for binman itb layout selection
> Default is using binman.dtsi
>
> Signed-off-by: Randolph 
> ---
>  arch/riscv/Kconfig   | 7 +++
>  arch/riscv/dts/ae350-u-boot.dtsi | 1 +
>  arch/riscv/dts/ae350_32.dts  | 1 -
>  arch/riscv/dts/ae350_64.dts  | 1 -
>  4 files changed, 8 insertions(+), 2 deletions(-)
>
> diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
> index aff1f33665..ec1cfcaaa7 100644
> --- a/arch/riscv/Kconfig
> +++ b/arch/riscv/Kconfig
> @@ -422,4 +422,11 @@ config TPL_USE_ARCH_MEMSET
>
>  endmenu
>
> +config SPL_LOAD_FIT_CONFIG
> +   string "Default FIT configuration for SPL"
> +   default "binman.dtsi"
> +   depends on SPL_LOAD_FIT
> +   help
> + Specify corresponding FIT configuration for SPL modes.
> +
>  endmenu
> diff --git a/arch/riscv/dts/ae350-u-boot.dtsi 
> b/arch/riscv/dts/ae350-u-boot.dtsi
> index aef9159b7a..ff5725501f 100644
> --- a/arch/riscv/dts/ae350-u-boot.dtsi
> +++ b/arch/riscv/dts/ae350-u-boot.dtsi
> @@ -1,4 +1,5 @@
>  // SPDX-License-Identifier: (GPL-2.0 OR MIT)
> +#include CONFIG_SPL_LOAD_FIT_CONFIG

That doesn't seem great to me. I will check the next patch.

>  / {
> cpus {
> diff --git a/arch/riscv/dts/ae350_32.dts b/arch/riscv/dts/ae350_32.dts
> index 61af6d5465..2caabad888 100644
> --- a/arch/riscv/dts/ae350_32.dts
> +++ b/arch/riscv/dts/ae350_32.dts
> @@ -2,7 +2,6 @@
>
>  /dts-v1/;
>
> -#include "binman.dtsi"
>  #include "ae350-u-boot.dtsi"
>
>  / {
> diff --git a/arch/riscv/dts/ae350_64.dts b/arch/riscv/dts/ae350_64.dts
> index 8c7db29b4f..9d5f6c743c 100644
> --- a/arch/riscv/dts/ae350_64.dts
> +++ b/arch/riscv/dts/ae350_64.dts
> @@ -2,7 +2,6 @@
>
>  /dts-v1/;
>
> -#include "binman.dtsi"
>  #include "ae350-u-boot.dtsi"
>
>  / {
> --
> 2.34.1
>

Regards,
Simon


[PATCH RESEND 1/7] riscv: dts: Introduce SPL_LOAD_FIT_CONFIG symbol

2023-10-06 Thread Randolph
Introduce common Kconfig symbol for riscv architecture
This symbol SPL_LOAD_FIT_CONFIG for binman itb layout selection
Default is using binman.dtsi

Signed-off-by: Randolph 
---
 arch/riscv/Kconfig   | 7 +++
 arch/riscv/dts/ae350-u-boot.dtsi | 1 +
 arch/riscv/dts/ae350_32.dts  | 1 -
 arch/riscv/dts/ae350_64.dts  | 1 -
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index aff1f33665..ec1cfcaaa7 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -422,4 +422,11 @@ config TPL_USE_ARCH_MEMSET
 
 endmenu
 
+config SPL_LOAD_FIT_CONFIG
+   string "Default FIT configuration for SPL"
+   default "binman.dtsi"
+   depends on SPL_LOAD_FIT
+   help
+ Specify corresponding FIT configuration for SPL modes.
+
 endmenu
diff --git a/arch/riscv/dts/ae350-u-boot.dtsi b/arch/riscv/dts/ae350-u-boot.dtsi
index aef9159b7a..ff5725501f 100644
--- a/arch/riscv/dts/ae350-u-boot.dtsi
+++ b/arch/riscv/dts/ae350-u-boot.dtsi
@@ -1,4 +1,5 @@
 // SPDX-License-Identifier: (GPL-2.0 OR MIT)
+#include CONFIG_SPL_LOAD_FIT_CONFIG
 
 / {
cpus {
diff --git a/arch/riscv/dts/ae350_32.dts b/arch/riscv/dts/ae350_32.dts
index 61af6d5465..2caabad888 100644
--- a/arch/riscv/dts/ae350_32.dts
+++ b/arch/riscv/dts/ae350_32.dts
@@ -2,7 +2,6 @@
 
 /dts-v1/;
 
-#include "binman.dtsi"
 #include "ae350-u-boot.dtsi"
 
 / {
diff --git a/arch/riscv/dts/ae350_64.dts b/arch/riscv/dts/ae350_64.dts
index 8c7db29b4f..9d5f6c743c 100644
--- a/arch/riscv/dts/ae350_64.dts
+++ b/arch/riscv/dts/ae350_64.dts
@@ -2,7 +2,6 @@
 
 /dts-v1/;
 
-#include "binman.dtsi"
 #include "ae350-u-boot.dtsi"
 
 / {
-- 
2.34.1