Skip to contentSkip to conversation

imx8mm-cl-iot-gate: Split the defconfigs

PATCH Superseded Fabio Estevam 1 participant 1 message Aug 17, 2021

Subsystems (3)

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 imx8mm-cl-iot-gate: Split the defconfigs

Currently imx8mm-cl-iot-gate_defconfig fails to produce a working boot binary due to the lack of fip.bin:

BINMAN all
Image 'main-section' is missing external blobs and is non-functional: blob-ext

Some images are invalid

To make the build process more consistent with the other i.MX8M targers, split the defconfig in two:

- imx8mm-cl-iot-gate_defconfig: standard defconfig that only requires ATF / DDR firmware.

- imx8mm-cl-iot-gate-optee_defconfig: "more advanced" defconfig that requires ATF / Optee / mbedtls / DDR firmware.

---
 arch/arm/dts/Makefile                         |   2 +
 .../dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi  | 255 ++++++++++++++++++
 arch/arm/dts/imx8mm-cl-iot-gate-optee.dts     |   6 +
 arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi   |  14 +-
 arch/arm/mach-imx/imx8m/Kconfig               |   7 +
 board/compulab/imx8mm-cl-iot-gate/Kconfig     |   2 +-
 configs/imx8mm-cl-iot-gate-optee_defconfig    | 147 ++++++++++
 7 files changed, 419 insertions(+), 14 deletions(-)
 create mode 100644 arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi
 create mode 100644 arch/arm/dts/imx8mm-cl-iot-gate-optee.dts
 create mode 100644 configs/imx8mm-cl-iot-gate-optee_defconfig
arch/arm/dts/Makefile +2 -0
index c42715ead4..88f52cd390 100644
@@ -1127,6 +1127,8 @@ dtb-$(CONFIG_TARGET_PRESIDIO_ASIC) += ca-presidio-engboard.dtb
 
 dtb-$(CONFIG_TARGET_IMX8MM_CL_IOT_GATE) += imx8mm-cl-iot-gate.dtb
 
+dtb-$(CONFIG_TARGET_IMX8MM_CL_IOT_GATE_OPTEE) += imx8mm-cl-iot-gate-optee.dtb
+
 dtb-$(CONFIG_TARGET_EA_LPC3250DEVKITV2) += lpc3250-ea3250.dtb
 
 targets += $(dtb-y)
arch/arm/dts/imx8mm-cl-iot-gate-optee-u-boot.dtsi new file +255 -0

255 lines not on this page · raw message

arch/arm/dts/imx8mm-cl-iot-gate-optee.dts new file +6 -0
new file mode 100644
index 0000000000..4d0ef46997
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright 2019 NXP
+ */
+
+#include "imx8mm-cl-iot-gate.dts"
arch/arm/dts/imx8mm-cl-iot-gate-u-boot.dtsi +1 -13
index 3226a244a9..00927c1574 100644
@@ -217,18 +217,6 @@
 					};
 				};
 
-				fip {
-					description = "Trusted Firmware FIP";
-					type = "firmware";
-					arch = "arm64";
-					compression = "none";
-					load = <0x40310000>;
-
-					fip_blob: blob-ext{
-						filename = "fip.bin";
-					};
-				};
-
 				fdt {
 					description = "NAME";
 					type = "flat_dt";
@@ -246,7 +234,7 @@
 				conf {
 					description = "NAME";
 					firmware = "uboot";
-					loadables = "atf", "fip";
+					loadables = "atf";
 					fdt = "fdt";
 				};
 			};
arch/arm/mach-imx/imx8m/Kconfig +7 -0
index ccaf106be5..dfda4cb70e 100644
@@ -138,6 +138,13 @@ config TARGET_IMX8MM_CL_IOT_GATE
 	select IMX8MM
 	select SUPPORT_SPL
 	select IMX8M_LPDDR4
+
+config TARGET_IMX8MM_CL_IOT_GATE_OPTEE
+	bool "CompuLab iot-gate-imx8 with optee support"
+	select BINMAN
+	select IMX8MM
+	select SUPPORT_SPL
+	select IMX8M_LPDDR4
 endchoice
 
 source "board/beacon/imx8mm/Kconfig"
board/compulab/imx8mm-cl-iot-gate/Kconfig +1 -1
index 7f5c794bf5..f32102f24b 100644
@@ -1,4 +1,4 @@
-if TARGET_IMX8MM_CL_IOT_GATE
+if TARGET_IMX8MM_CL_IOT_GATE || TARGET_IMX8MM_CL_IOT_GATE_OPTEE
 
 config SYS_BOARD
 	default "imx8mm-cl-iot-gate"
configs/imx8mm-cl-iot-gate-optee_defconfig new file +147 -0

147 lines not on this page · raw message

Signature · 1 line
2.25.1