Skip to contentSkip to conversation

imx8mm-venice: use binman to pack images

PATCH New Tim Harvey 2 participants 8 messages Aug 24, 2021 – Oct 20, 2021

Subsystems (3)
lore
Share & tools
lore

Tim Harvey

author
#0 lore raw

cover imx8mm-venice: use binman to pack images

This series changes imx8mm-venice to use binman to pack images.

Tim Harvey (4):
arm64: dts: imx8mm-venice-gw700x-u-boot.dtsi: use
imx8mm-venice-u-boot.dtsi
arm64: dts: imx8mm-venice-gw7901-u-boot.dtsi: use
imx8mm-venice-u-boot.dtsi
arm64: dts: imx8mm-venice-gw7902-u-boot.dtsi: use
imx8mm-venice-u-boot.dtsi
imx8mm_venice: switch to use binman to pack images

 arch/arm/dts/imx8mm-venice-gw700x-u-boot.dtsi |  62 ++-------
 arch/arm/dts/imx8mm-venice-gw7901-u-boot.dtsi |  66 +---------
 arch/arm/dts/imx8mm-venice-gw7902-u-boot.dtsi |  54 +-------
 arch/arm/dts/imx8mm-venice-u-boot.dtsi        | 119 ++++++++++++++++++
 arch/arm/mach-imx/imx8m/Kconfig               |   1 +
 board/gateworks/venice/README                 |   2 +-
 .../gateworks/venice/imximage-8mm-lpddr4.cfg  |   9 ++
 configs/imx8mm_venice_defconfig               |   6 +-
 8 files changed, 148 insertions(+), 171 deletions(-)
 create mode 100644 board/gateworks/venice/imximage-8mm-lpddr4.cfg
Signature · 1 line
2.17.1
author
#1 lore raw

PATCH 1/4 arm64: dts: imx8mm-venice-gw700x: use imx8mm-venice-u-boot.dtsi

Use the common imx8mm-venice-u-boot.dtsi (dtb for the 'DEFAULT_DEVICE_TREE) so that it inherits things like binman.

---
 arch/arm/dts/imx8mm-venice-gw700x-u-boot.dtsi | 62 +++----------------
 1 file changed, 9 insertions(+), 53 deletions(-)
arch/arm/dts/imx8mm-venice-gw700x-u-boot.dtsi +9 -53
index 1a15d6a2ad..7670243851 100644
@@ -3,59 +3,7 @@
  * Copyright 2021 Gateworks Corporation
  */
 
-#include "imx8mm-u-boot.dtsi"
-
-&gpio1 {
-	u-boot,dm-spl;
-};
-
-&gpio2 {
-	u-boot,dm-spl;
-};
-
-&gpio3 {
-	u-boot,dm-spl;
-};
-
-&gpio4 {
-	u-boot,dm-spl;
-};
-
-&gpio5 {
-	u-boot,dm-spl;
-};
-
-&uart2 {
-	u-boot,dm-spl;
-};
-
-&pinctrl_uart2 {
-	u-boot,dm-spl;
-};
-
-&usdhc3 {
-	u-boot,dm-spl;
-};
-
-&pinctrl_usdhc3 {
-	u-boot,dm-spl;
-};
-
-&i2c1 {
-	u-boot,dm-spl;
-};
-
-&pinctrl_i2c1 {
-	u-boot,dm-spl;
-};
-
-&i2c2 {
-	u-boot,dm-spl;
-};
-
-&pinctrl_i2c2 {
-	u-boot,dm-spl;
-};
+#include "imx8mm-venice-u-boot.dtsi"
 
 &fec1 {
 	phy-reset-gpios = <&gpio3 0 GPIO_ACTIVE_LOW>;
@@ -63,6 +11,10 @@
 	phy-reset-post-delay = <1>;
 };
 
+&pinctrl_fec1 {
+	u-boot,dm-spl;
+};
+
 &{/soc@0/bus@30800000/i2c@30a20000/pmic@69} {
 	u-boot,dm-spl;
 };
@@ -70,3 +22,7 @@
 &{/soc@0/bus@30800000/i2c@30a20000/pmic@69/regulators} {
 	u-boot,dm-spl;
 };
+
+&pinctrl_pmic {
+	u-boot,dm-spl;
+};
Signature · 1 line
2.17.1
#2 lore raw

PATCH 1/4 arm64: dts: imx8mm-venice-gw700x: use imx8mm-venice-u-boot.dtsi

Quoted 3 lines

Use the common imx8mm-venice-u-boot.dtsi (dtb for the 'DEFAULT_DEVICE_TREE) so that it inherits things like binman.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
author
#3 lore raw

PATCH 2/4 arm64: dts: imx8mm-venice-gw7901: use imx8mm-venice-u-boot.dtsi

In reply to Tim Harvey

Use the common imx8mm-venice-u-boot.dtsi (dtb for the 'DEFAULT_DEVICE_TREE) so that it inherits things like binman.

---
 arch/arm/dts/imx8mm-venice-gw7901-u-boot.dtsi | 66 ++-----------------
 1 file changed, 5 insertions(+), 61 deletions(-)
arch/arm/dts/imx8mm-venice-gw7901-u-boot.dtsi +5 -61
index a5adf27649..a801ee1deb 100644
@@ -3,67 +3,7 @@
  * Copyright 2020 Gateworks Corporation
  */
 
-#include "imx8mm-u-boot.dtsi"
-
-&gpio1 {
-	u-boot,dm-spl;
-};
-
-&gpio2 {
-	u-boot,dm-spl;
-};
-
-&gpio3 {
-	u-boot,dm-spl;
-};
-
-&gpio4 {
-	u-boot,dm-spl;
-};
-
-&gpio5 {
-	u-boot,dm-spl;
-};
-
-&uart2 {
-	u-boot,dm-spl;
-};
-
-&pinctrl_uart2 {
-	u-boot,dm-spl;
-};
-
-&usdhc2 {
-	u-boot,dm-spl;
-};
-
-&pinctrl_usdhc2 {
-	u-boot,dm-spl;
-};
-
-&usdhc3 {
-	u-boot,dm-spl;
-};
-
-&pinctrl_usdhc3 {
-	u-boot,dm-spl;
-};
-
-&i2c1 {
-	u-boot,dm-spl;
-};
-
-&pinctrl_i2c1 {
-	u-boot,dm-spl;
-};
-
-&i2c2 {
-	u-boot,dm-spl;
-};
-
-&pinctrl_i2c2 {
-	u-boot,dm-spl;
-};
+#include "imx8mm-venice-u-boot.dtsi"
 
 &fec1 {
 	phy-reset-gpios = <&gpio4 19 GPIO_ACTIVE_LOW>;
@@ -71,6 +11,10 @@
 	phy-reset-post-delay = <1>;
 };
 
+&pinctrl_fec1 {
+	u-boot,dm-spl;
+};
+
 &{/soc@0/bus@30800000/i2c@30a30000/pmic@4b} {
 	u-boot,dm-spl;
 };
Signature · 1 line
2.17.1
#4 lore raw

PATCH 2/4 arm64: dts: imx8mm-venice-gw7901: use imx8mm-venice-u-boot.dtsi

Quoted 3 lines

Use the common imx8mm-venice-u-boot.dtsi (dtb for the 'DEFAULT_DEVICE_TREE) so that it inherits things like binman.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
author
#5 lore raw

PATCH 3/4 arm64: dts: imx8mm-venice-gw7902: use imx8mm-venice-u-boot.dtsi

In reply to Tim Harvey

Use the common imx8mm-venice-u-boot.dtsi (dtb for the 'DEFAULT_DEVICE_TREE) so that it inherits things like binman.

---
 arch/arm/dts/imx8mm-venice-gw7902-u-boot.dtsi | 54 +------------------
 1 file changed, 1 insertion(+), 53 deletions(-)
arch/arm/dts/imx8mm-venice-gw7902-u-boot.dtsi +1 -53
index 361ddaa78f..d0e5d6c5b6 100644
@@ -3,59 +3,7 @@
  * Copyright 2021 Gateworks Corporation
  */
 
-#include "imx8mm-u-boot.dtsi"
-
-&gpio1 {
-	u-boot,dm-spl;
-};
-
-&gpio2 {
-	u-boot,dm-spl;
-};
-
-&gpio3 {
-	u-boot,dm-spl;
-};
-
-&gpio4 {
-	u-boot,dm-spl;
-};
-
-&gpio5 {
-	u-boot,dm-spl;
-};
-
-&uart2 {
-	u-boot,dm-spl;
-};
-
-&pinctrl_uart2 {
-	u-boot,dm-spl;
-};
-
-&usdhc3 {
-	u-boot,dm-spl;
-};
-
-&pinctrl_usdhc3 {
-	u-boot,dm-spl;
-};
-
-&i2c1 {
-	u-boot,dm-spl;
-};
-
-&pinctrl_i2c1 {
-	u-boot,dm-spl;
-};
-
-&i2c2 {
-	u-boot,dm-spl;
-};
-
-&pinctrl_i2c2 {
-	u-boot,dm-spl;
-};
+#include "imx8mm-venice-u-boot.dtsi"
 
 &fec1 {
 	phy-reset-gpios = <&gpio1 10 GPIO_ACTIVE_LOW>;
Signature · 1 line
2.17.1
#6 lore raw

PATCH 3/4 arm64: dts: imx8mm-venice-gw7902: use imx8mm-venice-u-boot.dtsi

Quoted 3 lines

Use the common imx8mm-venice-u-boot.dtsi (dtb for the 'DEFAULT_DEVICE_TREE) so that it inherits things like binman.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
author
#7 lore raw

PATCH 4/4 imx8mm_venice: switch to use binman to pack images

In reply to Tim Harvey

Use binman to pack images.

Note that imx8mm_venice supports several boards via multiple DTB's thus in the fit node we must use:
- fit,fdt-list = "of-list"
- fdt-SEQ
- config-SEQ

---
 arch/arm/dts/imx8mm-venice-u-boot.dtsi        | 119 ++++++++++++++++++
 arch/arm/mach-imx/imx8m/Kconfig               |   1 +
 board/gateworks/venice/README                 |   2 +-
 .../gateworks/venice/imximage-8mm-lpddr4.cfg  |   9 ++
 configs/imx8mm_venice_defconfig               |   6 +-
 5 files changed, 133 insertions(+), 4 deletions(-)
 create mode 100644 board/gateworks/venice/imximage-8mm-lpddr4.cfg
arch/arm/dts/imx8mm-venice-u-boot.dtsi +119 -0
index 42b2903f04..e0fa9ff4bf 100644
@@ -6,6 +6,10 @@
 #include "imx8mm-u-boot.dtsi"
 
 / {
+	binman: binman {
+		multiple-images;
+	};
+
 	wdt-reboot {
 		compatible = "wdt-reboot";
 		wdt = <&wdog1>;
@@ -68,3 +72,118 @@
 &wdog1 {
 	u-boot,dm-spl;
 };
+
+&binman {
+	 u-boot-spl-ddr {
+		filename = "u-boot-spl-ddr.bin";
+		pad-byte = <0xff>;
+		align-size = <4>;
+		align = <4>;
+
+		u-boot-spl {
+			align-end = <4>;
+		};
+
+		blob_1: blob-ext@1 {
+			filename = "lpddr4_pmu_train_1d_imem.bin";
+			size = <0x8000>;
+		};
+
+		blob_2: blob-ext@2 {
+			filename = "lpddr4_pmu_train_1d_dmem.bin";
+			size = <0x4000>;
+		};
+
+		blob_3: blob-ext@3 {
+			filename = "lpddr4_pmu_train_2d_imem.bin";
+			size = <0x8000>;
+		};
+
+		blob_4: blob-ext@4 {
+			filename = "lpddr4_pmu_train_2d_dmem.bin";
+			size = <0x4000>;
+		};
+	};
+
+	spl {
+		filename = "spl.bin";
+
+		mkimage {
+			args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x7e1000";
+
+			blob {
+				filename = "u-boot-spl-ddr.bin";
+			};
+		};
+	};
+
+	itb {
+		filename = "u-boot.itb";
+
+		fit {
+			description = "Configuration to load ATF before U-Boot";
+			#address-cells = <1>;
+			fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
+			fit,fdt-list = "of-list";
+
+			images {
+				uboot {
+					description = "U-Boot (64-bit)";
+					type = "standalone";
+					arch = "arm64";
+					compression = "none";
+					load = <CONFIG_SYS_TEXT_BASE>;
+
+					uboot_blob: blob-ext {
+						filename = "u-boot-nodtb.bin";
+					};
+				};
+
+				atf {
+					description = "ARM Trusted Firmware";
+					type = "firmware";
+					arch = "arm64";
+					compression = "none";
+					load = <0x920000>;
+					entry = <0x920000>;
+
+					atf_blob: blob-ext {
+						filename = "bl31.bin";
+					};
+				};
+
+				@fdt-SEQ {
+					description = "NAME";
+					type = "flat_dt";
+					compression = "none";
+				};
+			};
+
+			configurations {
+				default = "@config-DEFAULT-SEQ";
+
+				@config-SEQ {
+					description = "NAME";
+					firmware = "uboot";
+					loadables = "atf";
+					fdt = "fdt-SEQ";
+				};
+			};
+		};
+	};
+
+	imx-boot {
+		filename = "flash.bin";
+		pad-byte = <0x00>;
+
+		spl: blob-ext@1 {
+			filename = "spl.bin";
+			offset = <0x0>;
+		};
+
+		uboot: blob-ext@2 {
+			filename = "u-boot.itb";
+			offset = <0x57c00>;
+		};
+	};
+};
arch/arm/mach-imx/imx8m/Kconfig +1 -0
index ccaf106be5..43901f15d2 100644
@@ -71,6 +71,7 @@ config TARGET_IMX8MM_ICORE_MX8MM
 
 config TARGET_IMX8MM_VENICE
 	bool "Support Gateworks Venice iMX8M Mini module"
+	select BINMAN
 	select IMX8MM
 	select SUPPORT_SPL
 	select IMX8M_LPDDR4
board/gateworks/venice/README +1 -1
index 6a0ab1ef10..5f194b3ccc 100644
@@ -25,7 +25,7 @@ $ cp firmware-imx-8.9/firmware/ddr/synopsys/lpddr4*.bin .
 Build U-Boot
 ============
 $ make imx8mm_venice_defconfig
-$ make flash.bin CROSS_COMPILE=aarch64-linux-gnu- ATF_LOAD_ADDR=0x920000
+$ make CROSS_COMPILE=aarch64-linux-gnu- ATF_LOAD_ADDR=0x920000
 
 Update eMMC
 ===========
board/gateworks/venice/imximage-8mm-lpddr4.cfg new file +9 -0
new file mode 100644
index 0000000000..ccaa765cb7
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * Copyright 2021 Gateworks Corporation
+ */
+
+#define __ASSEMBLY__
+
+BOOT_FROM	sd
+LOADER		u-boot-spl-ddr.bin	0x7E1000
configs/imx8mm_venice_defconfig +3 -3
index 44ff5f84da..d751fb42aa 100644
@@ -26,10 +26,10 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_FIT_EXTERNAL_OFFSET=0x3000
 CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
+# CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_OF_BOARD_SETUP=y
 CONFIG_OF_SYSTEM_SETUP=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/gateworks/venice/imximage-8mm-lpddr4.cfg"
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_USE_PREBOOT=y
 CONFIG_PREBOOT="gsc wd-disable"
@@ -58,7 +58,7 @@ CONFIG_CMD_EXT4_WRITE=y
 # CONFIG_SPL_EFI_PARTITION is not set
 CONFIG_OF_CONTROL=y
 CONFIG_SPL_OF_CONTROL=y
-CONFIG_OF_LIST="imx8mm-venice-gw71xx-0x imx8mm-venice-gw72xx-0x imx8mm-venice-gw73xx-0x imx8mm-venice-gw7901 imx8mm-venice-gw7902"
+CONFIG_OF_LIST="imx8mm-venice imx8mm-venice-gw71xx-0x imx8mm-venice-gw72xx-0x imx8mm-venice-gw73xx-0x imx8mm-venice-gw7901 imx8mm-venice-gw7902"
 CONFIG_ENV_IS_IN_MMC=y
 CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
 CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
Signature · 1 line
2.17.1