From f1c8e9c44242fca281d118f051a0d5bbc581da48 Mon Sep 17 00:00:00 2001
From: Nishanth Menon <nm@ti.com>
Date: Fri, 3 Nov 2023 21:45:10 -0500
Subject: [PATCH] arm: mach-k3: Move K3 degenerate keys out of board folder
This file is common for all of K3, 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 <nm@ti.com>
Reviewed-by: Francesco Dolcini <francesco.dolcini@toradex.com>
Reviewed-by: Andrew Davis <afd@ti.com>
---
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/ti-degenerate-key.pem | 0
3 files changed, 1 insertion(+), 5 deletions(-)
rename {board/ti => arch/arm/mach-k3}/keys/ti-degenerate-key.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 089b2a5f5c..274b699375 100644
--- a/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi
+++ b/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi
@@ -9,10 +9,6 @@
filename = "../../ti/keys/custMpk.pem";
};
-&dkey_pem {
- filename = "../../ti/keys/ti-degenerate-key.pem";
-};
-
#ifndef CONFIG_ARM64
&bcfg_yaml {
diff --git a/arch/arm/dts/k3-binman.dtsi b/arch/arm/dts/k3-binman.dtsi
index 2ea2dd18a1..db3f1cf40f 100644
--- a/arch/arm/dts/k3-binman.dtsi
+++ b/arch/arm/dts/k3-binman.dtsi
@@ -20,7 +20,7 @@
ti-degenerate-key {
filename = "ti-degenerate-key.pem";
dkey_pem: blob-ext {
- filename = "../keys/ti-degenerate-key.pem";
+ filename = "arch/arm/mach-k3/keys/ti-degenerate-key.pem";
};
};
};
diff --git a/board/ti/keys/ti-degenerate-key.pem b/arch/arm/mach-k3/keys/ti-degenerate-key.pem
similarity index 100%
rename from board/ti/keys/ti-degenerate-key.pem
rename to arch/arm/mach-k3/keys/ti-degenerate-key.pem
--
2.39.5