From 110b07c8bcb611ddf5b6bed44f5eb9ac14ebecec Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Fri, 3 Nov 2023 21:45:11 -0500 Subject: [PATCH] arm: mach-k3: Move TI dummy keys out of board folder This file is used to emulate customer keys on TI development board ecosystems, move it out of board/ directory and into mach-k3. And change the relative paths to absolute paths in the binman paths. While at it, drop the reference in verdin-binman file which is redundant. Signed-off-by: Nishanth Menon Reviewed-by: Francesco Dolcini Acked-by: Manorit Chawdhry --- arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi | 4 ---- arch/arm/dts/k3-binman.dtsi | 2 +- {board/ti => arch/arm/mach-k3}/keys/custMpk.crt | 0 {board/ti => arch/arm/mach-k3}/keys/custMpk.key | 0 {board/ti => arch/arm/mach-k3}/keys/custMpk.pem | 0 5 files changed, 1 insertion(+), 5 deletions(-) rename {board/ti => arch/arm/mach-k3}/keys/custMpk.crt (100%) rename {board/ti => arch/arm/mach-k3}/keys/custMpk.key (100%) rename {board/ti => arch/arm/mach-k3}/keys/custMpk.pem (100%) diff --git a/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi b/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi index 274b699375..9c2d1df6b7 100644 --- a/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi +++ b/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi @@ -5,10 +5,6 @@ #include "k3-binman.dtsi" -&custmpk_pem { - filename = "../../ti/keys/custMpk.pem"; -}; - #ifndef CONFIG_ARM64 &bcfg_yaml { diff --git a/arch/arm/dts/k3-binman.dtsi b/arch/arm/dts/k3-binman.dtsi index db3f1cf40f..d1ef2fac31 100644 --- a/arch/arm/dts/k3-binman.dtsi +++ b/arch/arm/dts/k3-binman.dtsi @@ -13,7 +13,7 @@ custMpk { filename = "custMpk.pem"; custmpk_pem: blob-ext { - filename = "../keys/custMpk.pem"; + filename = "arch/arm/mach-k3/keys/custMpk.pem"; }; }; diff --git a/board/ti/keys/custMpk.crt b/arch/arm/mach-k3/keys/custMpk.crt similarity index 100% rename from board/ti/keys/custMpk.crt rename to arch/arm/mach-k3/keys/custMpk.crt diff --git a/board/ti/keys/custMpk.key b/arch/arm/mach-k3/keys/custMpk.key similarity index 100% rename from board/ti/keys/custMpk.key rename to arch/arm/mach-k3/keys/custMpk.key diff --git a/board/ti/keys/custMpk.pem b/arch/arm/mach-k3/keys/custMpk.pem similarity index 100% rename from board/ti/keys/custMpk.pem rename to arch/arm/mach-k3/keys/custMpk.pem -- 2.39.5