imx8m: Guard binman nodes with CONFIG_OPTEE
Subsystems (2)
Fabio Estevam
reviewerPATCH 1/1 imx8m: Guard binman nodes with CONFIG_OPTEE
From: Fabio Estevam <[email protected]>
Guard binman nodes with CONFIG_OPTEE to fix the following error when building without optee support:
BINMAN .binman_stamp
Image 'image' has faked external blobs and is non-functional: tee.bin
Image 'image' is missing optional external blobs but is still functional: tee-os
/binman/section/fit/images/tee/tee-os (tee.bin):
See the documentation for your board. You may need to build Open Portable Trusted Execution Environment (OP-TEE) and build with TEE=/path/to/tee.bin
Some images are invalid
make: *** [Makefile:1135: .binman_stamp] Error 103
--- arch/arm/dts/imx8mm-u-boot.dtsi | 2 ++ arch/arm/dts/imx8mn-u-boot.dtsi | 2 ++ arch/arm/dts/imx8mp-u-boot.dtsi | 2 ++ arch/arm/dts/imx8mq-u-boot.dtsi | 2 ++ 4 files changed, 8 insertions(+)
arch/arm/dts/imx8mm-u-boot.dtsi +2 -0
@@ -164,6 +164,7 @@ }; #endif +#ifdef CONFIG_OPTEE tee: tee { description = "OP-TEE"; type = "tee";
@@ -178,6 +179,7 @@ optional; }; }; +#endif binman_fip: fip { arch = "arm64";
arch/arm/dts/imx8mn-u-boot.dtsi +2 -0
@@ -240,6 +240,7 @@ }; #endif +#ifdef CONFIG_OPTEE tee: tee { description = "OP-TEE"; type = "tee";
@@ -254,6 +255,7 @@ optional; }; }; +#endif binman_fip: fip { arch = "arm64";
arch/arm/dts/imx8mp-u-boot.dtsi +2 -0
@@ -185,6 +185,7 @@ }; #endif +#ifdef CONFIG_OPTEE tee: tee { description = "OP-TEE"; type = "tee";
@@ -199,6 +200,7 @@ optional; }; }; +#endif @fdt-SEQ { description = "NAME";
arch/arm/dts/imx8mq-u-boot.dtsi +2 -0
@@ -144,6 +144,7 @@ }; #endif +#ifdef CONFIG_OPTEE tee: tee { description = "OP-TEE"; type = "tee";
@@ -158,6 +159,7 @@ optional; }; }; +#endif fdt { compression = "none";
Signature · 1 line
2.34.1
Quoted 108 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Guard binman nodes with
CONFIG_OPTEEto fix the following error when building without optee support:BINMAN .binman_stamp
Image 'image' has faked external blobs and is non-functional: tee.binImage 'image' is missing optional external blobs but is still functional: tee-os
/binman/section/fit/images/tee/tee-os (tee.bin):
See the documentation for your board. You may need to build Open Portable Trusted Execution Environment (OP-TEE) and build with TEE=/path/to/tee.binSome images are invalid
make: *** [Makefile:1135: .binman_stamp] Error 103Reported-by Tim Harvey <[email protected]>Signed-off-by Fabio Estevam <[email protected]>--- arch/arm/dts/imx8mm-u-boot.dtsi | 2 ++ arch/arm/dts/imx8mn-u-boot.dtsi | 2 ++ arch/arm/dts/imx8mp-u-boot.dtsi | 2 ++ arch/arm/dts/imx8mq-u-boot.dtsi | 2 ++ 4 files changed, 8 insertions(+)arch/arm/dts/imx8mm-u-boot.dtsi +2
-0@@ -164,6 +164,7 @@ }; #endif +#ifdef CONFIG_OPTEE tee: tee { description = "OP-TEE"; type = "tee";@@ -178,6 +179,7 @@ optional; }; }; +#endif binman_fip: fip { arch = "arm64";arch/arm/dts/imx8mn-u-boot.dtsi +2
-0@@ -240,6 +240,7 @@ }; #endif +#ifdef CONFIG_OPTEE tee: tee { description = "OP-TEE"; type = "tee";@@ -254,6 +255,7 @@ optional; }; }; +#endif binman_fip: fip { arch = "arm64";arch/arm/dts/imx8mp-u-boot.dtsi +2
-0@@ -185,6 +185,7 @@ }; #endif +#ifdef CONFIG_OPTEE tee: tee { description = "OP-TEE"; type = "tee";@@ -199,6 +200,7 @@ optional; }; }; +#endif @fdt-SEQ { description = "NAME";arch/arm/dts/imx8mq-u-boot.dtsi +2
-1@@ -144,6 +144,7 @@ }; #endif +#ifdef CONFIG_OPTEE tee: tee { description = "OP-TEE"; type = "tee";@@ -158,6 +159,7 @@ optional; }; }; +#endif fdt { compression = "none"; --
Quoted 2 lines
2.34.1
Hi Fabio,
Thanks, much better than the ugly message and make status code failure if you don't have tee.bin.
I notice that loadables = "atf", "tee" now:
#ifndef CONFIG_ARMV8_PSCI
loadables = "atf", "tee";#endif
Does that need to be also protected against CONFIG_OPTEE? #ifndef CONFIG_ARMV8_PSCI
#ifdef CONFIG_OPTEE
loadables = "atf", "tee";
#else
#endif
loadables = "atf";#endif
Best Regards,
Tim
Quoted 14 lines · Fabio Estevam
From: Fabio Estevam <[email protected]>
Guard binman nodes with
CONFIG_OPTEEto fix the following error when building without optee support:BINMAN .binman_stamp
Image 'image' has faked external blobs and is non-functional: tee.binImage 'image' is missing optional external blobs but is still functional: tee-os
/binman/section/fit/images/tee/tee-os (tee.bin):
See the documentation for your board. You may need to build Open Portable Trusted Execution Environment (OP-TEE) and build with TEE=/path/to/tee.bin
Quoted 5 lines
Some images are invalid
make: *** [Makefile:1135: .binman_stamp] Error 103Reported-by Tim Harvey <[email protected]>Signed-off-by Fabio Estevam <[email protected]>
Given that the earlier part of the dtsi already guards with OPTEE (except for the 'q' variant which doesn't have that entry to start with) this seems correct to me.
Signature · 1 line
Tom