From f01eb58237422e0575660524faf7d946329ceff4 Mon Sep 17 00:00:00 2001 From: Maik Otto Date: Wed, 21 Aug 2019 16:21:45 +0200 Subject: imx6: added fit image signature to the devicetree for PHYTEC boards the barebox checks the signed FIT-Image with a Public Key, which is stored for the PHYTEC i.MX6 boards in the device tree Signed-off-by: Maik Otto Signed-off-by: Sascha Hauer --- arch/arm/dts/imx6dl-phytec-pbab01.dts | 4 +++- arch/arm/dts/imx6dl-phytec-phyboard-subra.dts | 3 +++ arch/arm/dts/imx6dl-phytec-phycore-som-emmc.dts | 4 +++- arch/arm/dts/imx6dl-phytec-phycore-som-lc-emmc.dts | 4 +++- arch/arm/dts/imx6dl-phytec-phycore-som-lc-nand.dts | 4 +++- arch/arm/dts/imx6dl-phytec-phycore-som-nand.dts | 4 +++- arch/arm/dts/imx6q-phytec-pbaa03.dts | 3 +++ arch/arm/dts/imx6q-phytec-pbab01.dts | 3 +++ arch/arm/dts/imx6q-phytec-phyboard-alcor.dts | 3 +++ arch/arm/dts/imx6q-phytec-phyboard-subra.dts | 3 +++ arch/arm/dts/imx6q-phytec-phycore-som-emmc.dts | 4 +++- arch/arm/dts/imx6q-phytec-phycore-som-nand.dts | 4 +++- arch/arm/dts/imx6qp-phytec-phycore-som-nand.dts | 3 +++ arch/arm/dts/imx6s-phytec-pbab01.dts | 4 +++- arch/arm/dts/imx6ul-phytec-phycore-som-nand.dts | 4 +++- arch/arm/dts/imx6ull-phytec-phycore-som-emmc.dts | 4 +++- arch/arm/dts/imx6ull-phytec-phycore-som-lc-nand.dts | 4 +++- arch/arm/dts/imx6ull-phytec-phycore-som-nand.dts | 4 +++- 18 files changed, 54 insertions(+), 12 deletions(-) diff --git a/arch/arm/dts/imx6dl-phytec-pbab01.dts b/arch/arm/dts/imx6dl-phytec-pbab01.dts index d10fbf668f..4fe3c308e7 100644 --- a/arch/arm/dts/imx6dl-phytec-pbab01.dts +++ b/arch/arm/dts/imx6dl-phytec-pbab01.dts @@ -10,7 +10,9 @@ */ /dts-v1/; - +#ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY +#include CONFIG_BOOTM_FITIMAGE_PUBKEY +#endif #include "imx6dl-phytec-pfla02.dtsi" #include "imx6qdl-phytec-pbab01.dtsi" diff --git a/arch/arm/dts/imx6dl-phytec-phyboard-subra.dts b/arch/arm/dts/imx6dl-phytec-phyboard-subra.dts index 3d1069a965..430745f100 100644 --- a/arch/arm/dts/imx6dl-phytec-phyboard-subra.dts +++ b/arch/arm/dts/imx6dl-phytec-phyboard-subra.dts @@ -10,6 +10,9 @@ */ /dts-v1/; +#ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY +#include CONFIG_BOOTM_FITIMAGE_PUBKEY +#endif #include "imx6s-phytec-pfla02.dtsi" #include "imx6qdl-phytec-phyboard-subra.dtsi" diff --git a/arch/arm/dts/imx6dl-phytec-phycore-som-emmc.dts b/arch/arm/dts/imx6dl-phytec-phycore-som-emmc.dts index 21cbb5f944..25d73ce3eb 100644 --- a/arch/arm/dts/imx6dl-phytec-phycore-som-emmc.dts +++ b/arch/arm/dts/imx6dl-phytec-phycore-som-emmc.dts @@ -11,7 +11,9 @@ */ /dts-v1/; - +#ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY +#include CONFIG_BOOTM_FITIMAGE_PUBKEY +#endif #include #include "imx6dl.dtsi" #include "imx6qdl-phytec-phycore-som.dtsi" diff --git a/arch/arm/dts/imx6dl-phytec-phycore-som-lc-emmc.dts b/arch/arm/dts/imx6dl-phytec-phycore-som-lc-emmc.dts index b8efb95ee0..a6b0e94172 100644 --- a/arch/arm/dts/imx6dl-phytec-phycore-som-lc-emmc.dts +++ b/arch/arm/dts/imx6dl-phytec-phycore-som-lc-emmc.dts @@ -5,7 +5,9 @@ */ /dts-v1/; - +#ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY +#include CONFIG_BOOTM_FITIMAGE_PUBKEY +#endif #include #include "imx6dl.dtsi" #include "imx6qdl-phytec-phycore-som.dtsi" diff --git a/arch/arm/dts/imx6dl-phytec-phycore-som-lc-nand.dts b/arch/arm/dts/imx6dl-phytec-phycore-som-lc-nand.dts index 4d38d1698a..195c3edca1 100644 --- a/arch/arm/dts/imx6dl-phytec-phycore-som-lc-nand.dts +++ b/arch/arm/dts/imx6dl-phytec-phycore-som-lc-nand.dts @@ -5,7 +5,9 @@ */ /dts-v1/; - +#ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY +#include CONFIG_BOOTM_FITIMAGE_PUBKEY +#endif #include #include "imx6dl.dtsi" #include "imx6qdl-phytec-phycore-som.dtsi" diff --git a/arch/arm/dts/imx6dl-phytec-phycore-som-nand.dts b/arch/arm/dts/imx6dl-phytec-phycore-som-nand.dts index 3ad3723d28..dfc33e4346 100644 --- a/arch/arm/dts/imx6dl-phytec-phycore-som-nand.dts +++ b/arch/arm/dts/imx6dl-phytec-phycore-som-nand.dts @@ -10,7 +10,9 @@ */ /dts-v1/; - +#ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY +#include CONFIG_BOOTM_FITIMAGE_PUBKEY +#endif #include #include "imx6dl.dtsi" #include "imx6qdl-phytec-phycore-som.dtsi" diff --git a/arch/arm/dts/imx6q-phytec-pbaa03.dts b/arch/arm/dts/imx6q-phytec-pbaa03.dts index 4724a02ad7..5216a2dfe3 100644 --- a/arch/arm/dts/imx6q-phytec-pbaa03.dts +++ b/arch/arm/dts/imx6q-phytec-pbaa03.dts @@ -10,6 +10,9 @@ */ /dts-v1/; +#ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY +#include CONFIG_BOOTM_FITIMAGE_PUBKEY +#endif #include "imx6q-phytec-pcaaxl3.dtsi" / { diff --git a/arch/arm/dts/imx6q-phytec-pbab01.dts b/arch/arm/dts/imx6q-phytec-pbab01.dts index 2f816dd1ac..91562a2ffe 100644 --- a/arch/arm/dts/imx6q-phytec-pbab01.dts +++ b/arch/arm/dts/imx6q-phytec-pbab01.dts @@ -10,6 +10,9 @@ */ /dts-v1/; +#ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY +#include CONFIG_BOOTM_FITIMAGE_PUBKEY +#endif #include "imx6q-phytec-pfla02.dtsi" #include "imx6qdl-phytec-pbab01.dtsi" diff --git a/arch/arm/dts/imx6q-phytec-phyboard-alcor.dts b/arch/arm/dts/imx6q-phytec-phyboard-alcor.dts index 1c4a78552d..d97c7f15c9 100644 --- a/arch/arm/dts/imx6q-phytec-phyboard-alcor.dts +++ b/arch/arm/dts/imx6q-phytec-phyboard-alcor.dts @@ -10,6 +10,9 @@ */ /dts-v1/; +#ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY +#include CONFIG_BOOTM_FITIMAGE_PUBKEY +#endif #include "imx6q-phytec-pfla02.dtsi" / { diff --git a/arch/arm/dts/imx6q-phytec-phyboard-subra.dts b/arch/arm/dts/imx6q-phytec-phyboard-subra.dts index 561e985604..4986111036 100644 --- a/arch/arm/dts/imx6q-phytec-phyboard-subra.dts +++ b/arch/arm/dts/imx6q-phytec-phyboard-subra.dts @@ -11,6 +11,9 @@ */ /dts-v1/; +#ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY +#include CONFIG_BOOTM_FITIMAGE_PUBKEY +#endif #include "imx6q-phytec-pfla02.dtsi" #include "imx6qdl-phytec-phyboard-subra.dtsi" diff --git a/arch/arm/dts/imx6q-phytec-phycore-som-emmc.dts b/arch/arm/dts/imx6q-phytec-phycore-som-emmc.dts index 7a86d5b94d..268b1cdce5 100644 --- a/arch/arm/dts/imx6q-phytec-phycore-som-emmc.dts +++ b/arch/arm/dts/imx6q-phytec-phycore-som-emmc.dts @@ -10,7 +10,9 @@ */ /dts-v1/; - +#ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY +#include CONFIG_BOOTM_FITIMAGE_PUBKEY +#endif #include #include "imx6q.dtsi" #include "imx6qdl-phytec-phycore-som.dtsi" diff --git a/arch/arm/dts/imx6q-phytec-phycore-som-nand.dts b/arch/arm/dts/imx6q-phytec-phycore-som-nand.dts index 96d1de224c..d138c4171d 100644 --- a/arch/arm/dts/imx6q-phytec-phycore-som-nand.dts +++ b/arch/arm/dts/imx6q-phytec-phycore-som-nand.dts @@ -10,7 +10,9 @@ */ /dts-v1/; - +#ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY +#include CONFIG_BOOTM_FITIMAGE_PUBKEY +#endif #include #include "imx6q.dtsi" #include "imx6qdl-phytec-phycore-som.dtsi" diff --git a/arch/arm/dts/imx6qp-phytec-phycore-som-nand.dts b/arch/arm/dts/imx6qp-phytec-phycore-som-nand.dts index 437457ce75..1f39fb3536 100644 --- a/arch/arm/dts/imx6qp-phytec-phycore-som-nand.dts +++ b/arch/arm/dts/imx6qp-phytec-phycore-som-nand.dts @@ -11,6 +11,9 @@ */ /dts-v1/; +#ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY +#include CONFIG_BOOTM_FITIMAGE_PUBKEY +#endif #include #include "imx6qdl-phytec-phycore-som.dtsi" diff --git a/arch/arm/dts/imx6s-phytec-pbab01.dts b/arch/arm/dts/imx6s-phytec-pbab01.dts index 1cb5a237a3..516d20f776 100644 --- a/arch/arm/dts/imx6s-phytec-pbab01.dts +++ b/arch/arm/dts/imx6s-phytec-pbab01.dts @@ -10,7 +10,9 @@ */ /dts-v1/; - +#ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY +#include CONFIG_BOOTM_FITIMAGE_PUBKEY +#endif #include "imx6s-phytec-pfla02.dtsi" #include "imx6qdl-phytec-pbab01.dtsi" diff --git a/arch/arm/dts/imx6ul-phytec-phycore-som-nand.dts b/arch/arm/dts/imx6ul-phytec-phycore-som-nand.dts index 67478e26dc..c8d43c5e25 100644 --- a/arch/arm/dts/imx6ul-phytec-phycore-som-nand.dts +++ b/arch/arm/dts/imx6ul-phytec-phycore-som-nand.dts @@ -5,7 +5,9 @@ */ /dts-v1/; - +#ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY +#include CONFIG_BOOTM_FITIMAGE_PUBKEY +#endif #include #include "imx6ul-phytec-phycore-som.dtsi" #include "imx6ul-phytec-state.dtsi" diff --git a/arch/arm/dts/imx6ull-phytec-phycore-som-emmc.dts b/arch/arm/dts/imx6ull-phytec-phycore-som-emmc.dts index aa162cc42d..2201b4c1b2 100644 --- a/arch/arm/dts/imx6ull-phytec-phycore-som-emmc.dts +++ b/arch/arm/dts/imx6ull-phytec-phycore-som-emmc.dts @@ -5,7 +5,9 @@ */ /dts-v1/; - +#ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY +#include CONFIG_BOOTM_FITIMAGE_PUBKEY +#endif #include #include "imx6ul-phytec-phycore-som.dtsi" diff --git a/arch/arm/dts/imx6ull-phytec-phycore-som-lc-nand.dts b/arch/arm/dts/imx6ull-phytec-phycore-som-lc-nand.dts index e6c588b449..9c912df4de 100644 --- a/arch/arm/dts/imx6ull-phytec-phycore-som-lc-nand.dts +++ b/arch/arm/dts/imx6ull-phytec-phycore-som-lc-nand.dts @@ -5,7 +5,9 @@ */ /dts-v1/; - +#ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY +#include CONFIG_BOOTM_FITIMAGE_PUBKEY +#endif #include #include "imx6ul-phytec-phycore-som.dtsi" diff --git a/arch/arm/dts/imx6ull-phytec-phycore-som-nand.dts b/arch/arm/dts/imx6ull-phytec-phycore-som-nand.dts index a5fa3e051c..224e853e1a 100644 --- a/arch/arm/dts/imx6ull-phytec-phycore-som-nand.dts +++ b/arch/arm/dts/imx6ull-phytec-phycore-som-nand.dts @@ -5,7 +5,9 @@ */ /dts-v1/; - +#ifdef CONFIG_BOOTM_FITIMAGE_PUBKEY +#include CONFIG_BOOTM_FITIMAGE_PUBKEY +#endif #include #include "imx6ul-phytec-phycore-som.dtsi" #include "imx6ul-phytec-state.dtsi" -- cgit v1.2.3