Re: [PATCH v2 14/14] arm: Rename STM32MP15x

2024-01-19 Thread Patrice CHOTARD



On 1/15/24 18:40, Patrice CHOTARD wrote:
> 
> 
> On 1/15/24 15:05, Patrick Delaunay wrote:
>> CONFIG options must not use lower-case letter. Convert this and related
>> ones to upper case.
>>
>> Signed-off-by: Simon Glass > Signed-off-by: Patrick Delaunay 
>> ---
>> See Simon's patch in serie "Clean up of bad Kconfig options" never merged
>> https://patchwork.ozlabs.org/project/uboot/list/?series=339004=*
>> https://patchwork.ozlabs.org/project/uboot/patch/20230129005903.74918-69-...@chromium.org/
>>
>> Changes in v2:
>> - add "arm: Rename STM32MP15x"
>>
>>  arch/arm/dts/Makefile   |  2 +-
>>  arch/arm/dts/stm32mp15-u-boot.dtsi  |  2 +-
>>  arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi|  4 ++--
>>  arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi|  4 ++--
>>  arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi|  4 ++--
>>  arch/arm/mach-stm32mp/Kconfig   |  6 +++---
>>  arch/arm/mach-stm32mp/Kconfig.15x   |  6 +++---
>>  arch/arm/mach-stm32mp/Makefile  |  2 +-
>>  arch/arm/mach-stm32mp/cmd_stm32key.c| 10 +-
>>  arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h |  4 ++--
>>  arch/arm/mach-stm32mp/include/mach/stm32.h  | 12 ++--
>>  arch/arm/mach-stm32mp/stm32mp1/Makefile |  2 +-
>>  arch/arm/mach-stm32mp/stm32mp1/fdt.c|  6 +++---
>>  board/st/common/Kconfig |  2 +-
>>  board/st/stm32mp1/Kconfig   |  2 +-
>>  board/st/stm32mp1/stm32mp1.c|  6 +++---
>>  configs/stm32mp15_basic_defconfig   |  2 +-
>>  configs/stm32mp15_defconfig |  2 +-
>>  configs/stm32mp15_trusted_defconfig |  4 ++--
>>  drivers/clk/stm32/Kconfig   |  2 +-
>>  20 files changed, 42 insertions(+), 42 deletions(-)
>>
>> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
>> index 8dcf1f5717ce..02074440b55d 100644
>> --- a/arch/arm/dts/Makefile
>> +++ b/arch/arm/dts/Makefile
>> @@ -1363,7 +1363,7 @@ dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtb
>>  dtb-$(CONFIG_STM32MP13X) += \
>>  stm32mp135f-dk.dtb
>>  
>> -dtb-$(CONFIG_STM32MP15x) += \
>> +dtb-$(CONFIG_STM32MP15X) += \
>>  stm32mp157a-dk1.dtb \
>>  stm32mp157a-dk1-scmi.dtb \
>>  stm32mp157a-icore-stm32mp1-ctouch2.dtb \
>> diff --git a/arch/arm/dts/stm32mp15-u-boot.dtsi 
>> b/arch/arm/dts/stm32mp15-u-boot.dtsi
>> index 573dd4d3ed56..fe56f05616a0 100644
>> --- a/arch/arm/dts/stm32mp15-u-boot.dtsi
>> +++ b/arch/arm/dts/stm32mp15-u-boot.dtsi
>> @@ -206,7 +206,7 @@
>>  resets = < UART8_R>;
>>  };
>>  
>> -#if defined(CONFIG_STM32MP15x_STM32IMAGE)
>> +#if defined(CONFIG_STM32MP15X_STM32IMAGE)
>>   {
>>  u-boot-stm32 {
>>  filename = "u-boot.stm32";
>> diff --git a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi 
>> b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
>> index 2623cebf21a4..a16358266a2d 100644
>> --- a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
>> +++ b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
>> @@ -22,13 +22,13 @@
>>  st,stm32prog-gpios = < 14 (GPIO_ACTIVE_LOW | 
>> GPIO_PULL_UP)>;
>>  };
>>  
>> -#if defined(CONFIG_STM32MP15x_STM32IMAGE) || defined(CONFIG_SPL)
>> +#if defined(CONFIG_STM32MP15X_STM32IMAGE) || defined(CONFIG_SPL)
>>  config {
>>  u-boot,mmc-env-partition = "ssbl";
>>  };
>>  #endif
>>  
>> -#ifdef CONFIG_STM32MP15x_STM32IMAGE
>> +#ifdef CONFIG_STM32MP15X_STM32IMAGE
>>  /* only needed for boot with TF-A, witout FIP support */
>>  firmware {
>>  optee {
>> diff --git a/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi 
>> b/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi
>> index b8288273ddb5..ef91088aa375 100644
>> --- a/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi
>> +++ b/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi
>> @@ -20,13 +20,13 @@
>>  st,stm32prog-gpios = < 14 (GPIO_ACTIVE_LOW | 
>> GPIO_PULL_UP)>;
>>  };
>>  
>> -#if defined(CONFIG_STM32MP15x_STM32IMAGE) || defined(CONFIG_SPL)
>> +#if defined(CONFIG_STM32MP15X_STM32IMAGE) || defined(CONFIG_SPL)
>>  config {
>>  u-boot,mmc-env-partition = "ssbl";
>>  };
>>  #endif
>>  
>> -#ifdef CONFIG_STM32MP15x_STM32IMAGE
>> +#ifdef CONFIG_STM32MP15X_STM32IMAGE
>>  /* only needed for boot with TF-A, witout FIP support */
>>  firmware {
>>  optee {
>> diff --git a/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi 
>> b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
>> index eb283cacd27d..139940bd5d47 100644
>> --- a/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
>> +++ b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
>> @@ -28,7 +28,7 @@
>>  #address-cells = <1>;
>>  #size-cells = <1>;
>>  
>> -#if defined(CONFIG_STM32MP15x_STM32IMAGE) || defined(CONFIG_SPL)
>> +#if defined(CONFIG_STM32MP15X_STM32IMAGE) || defined(CONFIG_SPL)
>>  partition@0 {
>>  label = "fsbl1";
>>  reg = <0x 0x0004>;
>> @@ 

Re: [PATCH v2 14/14] arm: Rename STM32MP15x

2024-01-15 Thread Patrice CHOTARD



On 1/15/24 15:05, Patrick Delaunay wrote:
> CONFIG options must not use lower-case letter. Convert this and related
> ones to upper case.
> 
> Signed-off-by: Simon Glass  Signed-off-by: Patrick Delaunay 
> ---
> See Simon's patch in serie "Clean up of bad Kconfig options" never merged
> https://patchwork.ozlabs.org/project/uboot/list/?series=339004=*
> https://patchwork.ozlabs.org/project/uboot/patch/20230129005903.74918-69-...@chromium.org/
> 
> Changes in v2:
> - add "arm: Rename STM32MP15x"
> 
>  arch/arm/dts/Makefile   |  2 +-
>  arch/arm/dts/stm32mp15-u-boot.dtsi  |  2 +-
>  arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi|  4 ++--
>  arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi|  4 ++--
>  arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi|  4 ++--
>  arch/arm/mach-stm32mp/Kconfig   |  6 +++---
>  arch/arm/mach-stm32mp/Kconfig.15x   |  6 +++---
>  arch/arm/mach-stm32mp/Makefile  |  2 +-
>  arch/arm/mach-stm32mp/cmd_stm32key.c| 10 +-
>  arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h |  4 ++--
>  arch/arm/mach-stm32mp/include/mach/stm32.h  | 12 ++--
>  arch/arm/mach-stm32mp/stm32mp1/Makefile |  2 +-
>  arch/arm/mach-stm32mp/stm32mp1/fdt.c|  6 +++---
>  board/st/common/Kconfig |  2 +-
>  board/st/stm32mp1/Kconfig   |  2 +-
>  board/st/stm32mp1/stm32mp1.c|  6 +++---
>  configs/stm32mp15_basic_defconfig   |  2 +-
>  configs/stm32mp15_defconfig |  2 +-
>  configs/stm32mp15_trusted_defconfig |  4 ++--
>  drivers/clk/stm32/Kconfig   |  2 +-
>  20 files changed, 42 insertions(+), 42 deletions(-)
> 
> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
> index 8dcf1f5717ce..02074440b55d 100644
> --- a/arch/arm/dts/Makefile
> +++ b/arch/arm/dts/Makefile
> @@ -1363,7 +1363,7 @@ dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtb
>  dtb-$(CONFIG_STM32MP13X) += \
>   stm32mp135f-dk.dtb
>  
> -dtb-$(CONFIG_STM32MP15x) += \
> +dtb-$(CONFIG_STM32MP15X) += \
>   stm32mp157a-dk1.dtb \
>   stm32mp157a-dk1-scmi.dtb \
>   stm32mp157a-icore-stm32mp1-ctouch2.dtb \
> diff --git a/arch/arm/dts/stm32mp15-u-boot.dtsi 
> b/arch/arm/dts/stm32mp15-u-boot.dtsi
> index 573dd4d3ed56..fe56f05616a0 100644
> --- a/arch/arm/dts/stm32mp15-u-boot.dtsi
> +++ b/arch/arm/dts/stm32mp15-u-boot.dtsi
> @@ -206,7 +206,7 @@
>   resets = < UART8_R>;
>  };
>  
> -#if defined(CONFIG_STM32MP15x_STM32IMAGE)
> +#if defined(CONFIG_STM32MP15X_STM32IMAGE)
>   {
>   u-boot-stm32 {
>   filename = "u-boot.stm32";
> diff --git a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi 
> b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
> index 2623cebf21a4..a16358266a2d 100644
> --- a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
> +++ b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
> @@ -22,13 +22,13 @@
>   st,stm32prog-gpios = < 14 (GPIO_ACTIVE_LOW | 
> GPIO_PULL_UP)>;
>   };
>  
> -#if defined(CONFIG_STM32MP15x_STM32IMAGE) || defined(CONFIG_SPL)
> +#if defined(CONFIG_STM32MP15X_STM32IMAGE) || defined(CONFIG_SPL)
>   config {
>   u-boot,mmc-env-partition = "ssbl";
>   };
>  #endif
>  
> -#ifdef CONFIG_STM32MP15x_STM32IMAGE
> +#ifdef CONFIG_STM32MP15X_STM32IMAGE
>   /* only needed for boot with TF-A, witout FIP support */
>   firmware {
>   optee {
> diff --git a/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi 
> b/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi
> index b8288273ddb5..ef91088aa375 100644
> --- a/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi
> +++ b/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi
> @@ -20,13 +20,13 @@
>   st,stm32prog-gpios = < 14 (GPIO_ACTIVE_LOW | 
> GPIO_PULL_UP)>;
>   };
>  
> -#if defined(CONFIG_STM32MP15x_STM32IMAGE) || defined(CONFIG_SPL)
> +#if defined(CONFIG_STM32MP15X_STM32IMAGE) || defined(CONFIG_SPL)
>   config {
>   u-boot,mmc-env-partition = "ssbl";
>   };
>  #endif
>  
> -#ifdef CONFIG_STM32MP15x_STM32IMAGE
> +#ifdef CONFIG_STM32MP15X_STM32IMAGE
>   /* only needed for boot with TF-A, witout FIP support */
>   firmware {
>   optee {
> diff --git a/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi 
> b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
> index eb283cacd27d..139940bd5d47 100644
> --- a/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
> +++ b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
> @@ -28,7 +28,7 @@
>   #address-cells = <1>;
>   #size-cells = <1>;
>  
> -#if defined(CONFIG_STM32MP15x_STM32IMAGE) || defined(CONFIG_SPL)
> +#if defined(CONFIG_STM32MP15X_STM32IMAGE) || defined(CONFIG_SPL)
>   partition@0 {
>   label = "fsbl1";
>   reg = <0x 0x0004>;
> @@ -82,7 +82,7 @@
>   #address-cells = <1>;
>   #size-cells = <1>;
>  
> -#if 

[PATCH v2 14/14] arm: Rename STM32MP15x

2024-01-15 Thread Patrick Delaunay
CONFIG options must not use lower-case letter. Convert this and related
ones to upper case.

Signed-off-by: Simon Glass 
---
See Simon's patch in serie "Clean up of bad Kconfig options" never merged
https://patchwork.ozlabs.org/project/uboot/list/?series=339004=*
https://patchwork.ozlabs.org/project/uboot/patch/20230129005903.74918-69-...@chromium.org/

Changes in v2:
- add "arm: Rename STM32MP15x"

 arch/arm/dts/Makefile   |  2 +-
 arch/arm/dts/stm32mp15-u-boot.dtsi  |  2 +-
 arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi|  4 ++--
 arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi|  4 ++--
 arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi|  4 ++--
 arch/arm/mach-stm32mp/Kconfig   |  6 +++---
 arch/arm/mach-stm32mp/Kconfig.15x   |  6 +++---
 arch/arm/mach-stm32mp/Makefile  |  2 +-
 arch/arm/mach-stm32mp/cmd_stm32key.c| 10 +-
 arch/arm/mach-stm32mp/cmd_stm32prog/stm32prog.h |  4 ++--
 arch/arm/mach-stm32mp/include/mach/stm32.h  | 12 ++--
 arch/arm/mach-stm32mp/stm32mp1/Makefile |  2 +-
 arch/arm/mach-stm32mp/stm32mp1/fdt.c|  6 +++---
 board/st/common/Kconfig |  2 +-
 board/st/stm32mp1/Kconfig   |  2 +-
 board/st/stm32mp1/stm32mp1.c|  6 +++---
 configs/stm32mp15_basic_defconfig   |  2 +-
 configs/stm32mp15_defconfig |  2 +-
 configs/stm32mp15_trusted_defconfig |  4 ++--
 drivers/clk/stm32/Kconfig   |  2 +-
 20 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile
index 8dcf1f5717ce..02074440b55d 100644
--- a/arch/arm/dts/Makefile
+++ b/arch/arm/dts/Makefile
@@ -1363,7 +1363,7 @@ dtb-$(CONFIG_ARCH_STI) += stih410-b2260.dtb
 dtb-$(CONFIG_STM32MP13X) += \
stm32mp135f-dk.dtb
 
-dtb-$(CONFIG_STM32MP15x) += \
+dtb-$(CONFIG_STM32MP15X) += \
stm32mp157a-dk1.dtb \
stm32mp157a-dk1-scmi.dtb \
stm32mp157a-icore-stm32mp1-ctouch2.dtb \
diff --git a/arch/arm/dts/stm32mp15-u-boot.dtsi 
b/arch/arm/dts/stm32mp15-u-boot.dtsi
index 573dd4d3ed56..fe56f05616a0 100644
--- a/arch/arm/dts/stm32mp15-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp15-u-boot.dtsi
@@ -206,7 +206,7 @@
resets = < UART8_R>;
 };
 
-#if defined(CONFIG_STM32MP15x_STM32IMAGE)
+#if defined(CONFIG_STM32MP15X_STM32IMAGE)
  {
u-boot-stm32 {
filename = "u-boot.stm32";
diff --git a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi 
b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
index 2623cebf21a4..a16358266a2d 100644
--- a/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi
@@ -22,13 +22,13 @@
st,stm32prog-gpios = < 14 (GPIO_ACTIVE_LOW | 
GPIO_PULL_UP)>;
};
 
-#if defined(CONFIG_STM32MP15x_STM32IMAGE) || defined(CONFIG_SPL)
+#if defined(CONFIG_STM32MP15X_STM32IMAGE) || defined(CONFIG_SPL)
config {
u-boot,mmc-env-partition = "ssbl";
};
 #endif
 
-#ifdef CONFIG_STM32MP15x_STM32IMAGE
+#ifdef CONFIG_STM32MP15X_STM32IMAGE
/* only needed for boot with TF-A, witout FIP support */
firmware {
optee {
diff --git a/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi 
b/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi
index b8288273ddb5..ef91088aa375 100644
--- a/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi
@@ -20,13 +20,13 @@
st,stm32prog-gpios = < 14 (GPIO_ACTIVE_LOW | 
GPIO_PULL_UP)>;
};
 
-#if defined(CONFIG_STM32MP15x_STM32IMAGE) || defined(CONFIG_SPL)
+#if defined(CONFIG_STM32MP15X_STM32IMAGE) || defined(CONFIG_SPL)
config {
u-boot,mmc-env-partition = "ssbl";
};
 #endif
 
-#ifdef CONFIG_STM32MP15x_STM32IMAGE
+#ifdef CONFIG_STM32MP15X_STM32IMAGE
/* only needed for boot with TF-A, witout FIP support */
firmware {
optee {
diff --git a/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi 
b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
index eb283cacd27d..139940bd5d47 100644
--- a/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
+++ b/arch/arm/dts/stm32mp157c-ev1-u-boot.dtsi
@@ -28,7 +28,7 @@
#address-cells = <1>;
#size-cells = <1>;
 
-#if defined(CONFIG_STM32MP15x_STM32IMAGE) || defined(CONFIG_SPL)
+#if defined(CONFIG_STM32MP15X_STM32IMAGE) || defined(CONFIG_SPL)
partition@0 {
label = "fsbl1";
reg = <0x 0x0004>;
@@ -82,7 +82,7 @@
#address-cells = <1>;
#size-cells = <1>;
 
-#if defined(CONFIG_STM32MP15x_STM32IMAGE) || defined(CONFIG_SPL)
+#if defined(CONFIG_STM32MP15X_STM32IMAGE) || defined(CONFIG_SPL)
partition@0 {
label = "fsbl";
reg =