diff mbox series

[v6,3/4] arm: dts: k3-binman: fix rcfg_yaml and pcfg_yaml labels

Message ID 20230804100808.110072-4-marcel@ziswiler.com
State Accepted
Commit e5fe63d4f6ba3a7037c29ec49de51f8d7a5709cc
Delegated to: Tom Rini
Headers show
Series board: toradex: add verdin am62 support | expand

Commit Message

Marcel Ziswiler Aug. 4, 2023, 10:08 a.m. UTC 
From: Marcel Ziswiler <marcel.ziswiler@toradex.com>

Fix rcfg_yaml to really point to rm-cfg.yaml and pcfg_yaml to really
point to pm-cfg.yaml which likely is the intention.

While at it also add labels for the remaining items like custmpk_pem,
dkey_pem, bcfg_yaml_sysfw, scfg_yaml_sysfw, pcfg_yaml_sysfw and
rcfg_yaml_sysfw.

Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

---

Changes in v6:
- New commit fixing rcfg_yaml and pcfg_yaml labels actually pointing
  at correct yamls and adding labels for the remaining items.
Thanks to Neha for pointing me towards actually making use of those
labels.

 arch/arm/dts/k3-binman.dtsi | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Comments

Neha Malcom Francis Aug. 4, 2023, 10:14 a.m. UTC | #1 
Hi Marcel

On 04/08/23 15:38, Marcel Ziswiler wrote:
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> Fix rcfg_yaml to really point to rm-cfg.yaml and pcfg_yaml to really
> point to pm-cfg.yaml which likely is the intention.
> 
> While at it also add labels for the remaining items like custmpk_pem,
> dkey_pem, bcfg_yaml_sysfw, scfg_yaml_sysfw, pcfg_yaml_sysfw and
> rcfg_yaml_sysfw.
> 
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> ---
> 
> Changes in v6:
> - New commit fixing rcfg_yaml and pcfg_yaml labels actually pointing
>    at correct yamls and adding labels for the remaining items.
> Thanks to Neha for pointing me towards actually making use of those
> labels.
> 
>   arch/arm/dts/k3-binman.dtsi | 16 ++++++++--------
>   1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/arch/arm/dts/k3-binman.dtsi b/arch/arm/dts/k3-binman.dtsi
> index 2a67cebf94f..2ea2dd18a12 100644
> --- a/arch/arm/dts/k3-binman.dtsi
> +++ b/arch/arm/dts/k3-binman.dtsi
> @@ -12,14 +12,14 @@
>   &binman {
>   	custMpk {
>   		filename = "custMpk.pem";
> -		blob-ext {
> +		custmpk_pem: blob-ext {
>   			filename = "../keys/custMpk.pem";
>   		};
>   	};
>   
>   	ti-degenerate-key {
>   		filename = "ti-degenerate-key.pem";
> -		blob-ext {
> +		dkey_pem: blob-ext {
>   			filename = "../keys/ti-degenerate-key.pem";
>   		};
>   	};
> @@ -37,14 +37,14 @@
>   	};
>   	pm-cfg {
>   		filename = "pm-cfg.bin";
> -		rcfg_yaml: ti-board-config {
> +		pcfg_yaml: ti-board-config {
>   			config = "pm-cfg.yaml";
>   			schema = "../common/schema.yaml";
>   		};
>   	};
>   	rm-cfg {
>   		filename = "rm-cfg.bin";
> -		pcfg_yaml: ti-board-config {
> +		rcfg_yaml: ti-board-config {
>   			config = "rm-cfg.yaml";
>   			schema = "../common/schema.yaml";
>   		};

Thanks for catching these as well!

> @@ -93,19 +93,19 @@
>   	combined-sysfw-cfg {
>   		filename = "combined-sysfw-cfg.bin";
>   		ti-board-config {
> -			board-cfg {
> +			bcfg_yaml_sysfw: board-cfg {
>   				config = "board-cfg.yaml";
>   				schema = "../common/schema.yaml";
>   			};
> -			sec-cfg {
> +			scfg_yaml_sysfw: sec-cfg {
>   				config = "sec-cfg.yaml";
>   				schema = "../common/schema.yaml";
>   			};
> -			pm-cfg {
> +			pcfg_yaml_sysfw: pm-cfg {
>   				config = "pm-cfg.yaml";
>   				schema = "../common/schema.yaml";
>   			};
> -			rm-cfg {
> +			rcfg_yaml_sysfw: rm-cfg {
>   				config = "rm-cfg.yaml";
>   				schema = "../common/schema.yaml";
>   			};

Reviewed-by: Neha Malcom Francis <n-francis@ti.com>
Nishanth Menon Aug. 4, 2023, 6:14 p.m. UTC | #2 
On 12:08-20230804, Marcel Ziswiler wrote:
> From: Marcel Ziswiler <marcel.ziswiler@toradex.com>
> 
> Fix rcfg_yaml to really point to rm-cfg.yaml and pcfg_yaml to really
> point to pm-cfg.yaml which likely is the intention.
> 
> While at it also add labels for the remaining items like custmpk_pem,
> dkey_pem, bcfg_yaml_sysfw, scfg_yaml_sysfw, pcfg_yaml_sysfw and
> rcfg_yaml_sysfw.
> 
> Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>

Reviewed-by: Nishanth Menon <nm@ti.com>
diff mbox series

Patch

diff --git a/arch/arm/dts/k3-binman.dtsi b/arch/arm/dts/k3-binman.dtsi
index 2a67cebf94f..2ea2dd18a12 100644
--- a/arch/arm/dts/k3-binman.dtsi
+++ b/arch/arm/dts/k3-binman.dtsi
@@ -12,14 +12,14 @@ 
 &binman {
 	custMpk {
 		filename = "custMpk.pem";
-		blob-ext {
+		custmpk_pem: blob-ext {
 			filename = "../keys/custMpk.pem";
 		};
 	};
 
 	ti-degenerate-key {
 		filename = "ti-degenerate-key.pem";
-		blob-ext {
+		dkey_pem: blob-ext {
 			filename = "../keys/ti-degenerate-key.pem";
 		};
 	};
@@ -37,14 +37,14 @@ 
 	};
 	pm-cfg {
 		filename = "pm-cfg.bin";
-		rcfg_yaml: ti-board-config {
+		pcfg_yaml: ti-board-config {
 			config = "pm-cfg.yaml";
 			schema = "../common/schema.yaml";
 		};
 	};
 	rm-cfg {
 		filename = "rm-cfg.bin";
-		pcfg_yaml: ti-board-config {
+		rcfg_yaml: ti-board-config {
 			config = "rm-cfg.yaml";
 			schema = "../common/schema.yaml";
 		};
@@ -93,19 +93,19 @@ 
 	combined-sysfw-cfg {
 		filename = "combined-sysfw-cfg.bin";
 		ti-board-config {
-			board-cfg {
+			bcfg_yaml_sysfw: board-cfg {
 				config = "board-cfg.yaml";
 				schema = "../common/schema.yaml";
 			};
-			sec-cfg {
+			scfg_yaml_sysfw: sec-cfg {
 				config = "sec-cfg.yaml";
 				schema = "../common/schema.yaml";
 			};
-			pm-cfg {
+			pcfg_yaml_sysfw: pm-cfg {
 				config = "pm-cfg.yaml";
 				schema = "../common/schema.yaml";
 			};
-			rm-cfg {
+			rcfg_yaml_sysfw: rm-cfg {
 				config = "rm-cfg.yaml";
 				schema = "../common/schema.yaml";
 			};