[PATCH] arm: mach-k3: Move K3 degenerate keys out of board folder

[Andrew Davis]

On 11/3/23 5:44 PM, Nishanth Menon wrote:
> 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.
> 
> Signed-off-by: Nishanth Menon <nm at ti.com>
> ---
> Cc: Neha Malcom Francis <n-francis at ti.com>
> Cc: Simon Glass <sjg at chromium.org>
> Cc: Marcel Ziswiler <marcel.ziswiler at toradex.com>
> Cc: Vignesh Raghavendra <vigneshr at ti.com>
> Cc: Francesco Dolcini <francesco at dolcini.it>
> Cc: Andrew Davis <afd at ti.com>
> 
> Similar to the patch https://lore.kernel.org/all/20231101183329.65091-1-afd@ti.com/
> 
>   arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi         | 2 +-
>   arch/arm/dts/k3-binman.dtsi                               | 2 +-
>   {board/ti/keys => arch/arm/mach-k3}/ti-degenerate-key.pem | 0
>   3 files changed, 2 insertions(+), 2 deletions(-)
>   rename {board/ti/keys => arch/arm/mach-k3}/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 b489d8afbe36..a6d7c2df20e0 100644
> --- a/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi
> +++ b/arch/arm/dts/k3-am625-verdin-wifi-dev-binman.dtsi
> @@ -10,7 +10,7 @@
>   };
>   
>   &dkey_pem {
> -	filename = "../../ti/keys/ti-degenerate-key.pem";
> +	filename = "arch/arm/mach-k3/ti-degenerate-key.pem";
>   };

You shouldn't need to modify dkey_pem here anymore if the path is now
absolute, you can just drop this whole override node.

While here you might as well move the TI dummy key (custMpk.pem) over
the same way.

Andrew

>   
>   #ifdef CONFIG_TARGET_VERDIN_AM62_R5
> diff --git a/arch/arm/dts/k3-binman.dtsi b/arch/arm/dts/k3-binman.dtsi
> index 0212d44ee3b2..af0f83100bd5 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/ti-degenerate-key.pem";
>   		};
>   	};
>   };
> diff --git a/board/ti/keys/ti-degenerate-key.pem b/arch/arm/mach-k3/ti-degenerate-key.pem
> similarity index 100%
> rename from board/ti/keys/ti-degenerate-key.pem
> rename to arch/arm/mach-k3/ti-degenerate-key.pem