imx8: switch missing boards to binman
Subsystems (3)
cover imx8: switch missing boards to binman
This patchsets switches the remaining imx8 boards to binman.
Oliver Graute (8):
imx: imx8qm-rom7720: switch to binman
imx: imx8qm: cgtqmx8: switch to binman
imx: imx8qxp: imx8qxp_mek switch to binman
imx: imx8qm: imx8qm_mek switch to binman
imx: imx8qxp: giedi switch to binman
imx: imx8qxp: deneb switch to binman
imx: imx8x: colibri: switch to binman
imx: imx8: apalis: switch to binman
arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi | 104 ++++++++++++++ arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi | 2 + arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi | 104 ++++++++++++++ arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi | 127 +++++++++++++++++ arch/arm/dts/imx8qm-cgtqmx8.dts | 1 + arch/arm/dts/imx8qm-rom7720-a1.dts | 1 + arch/arm/dts/imx8qm-u-boot.dtsi | 133 ++++++++++++++++++ arch/arm/dts/imx8qxp-capricorn-u-boot.dtsi | 127 +++++++++++++++++ arch/arm/mach-imx/imx8/Kconfig | 8 ++ .../advantech/imx8qm_rom7720_a1/imximage.cfg | 4 +- board/congatec/cgtqmx8/imximage.cfg | 4 +- board/freescale/imx8qm_mek/README | 2 +- board/freescale/imx8qxp_mek/imximage.cfg | 3 +- board/siemens/capricorn/imximage.cfg | 2 +- configs/apalis-imx8_defconfig | 1 + configs/cgtqmx8_defconfig | 4 +- configs/colibri-imx8x_defconfig | 1 + configs/deneb_defconfig | 2 + configs/giedi_defconfig | 2 + configs/imx8qm_mek_defconfig | 2 + configs/imx8qm_rom7720_a1_4G_defconfig | 3 +- configs/imx8qxp_mek_defconfig | 2 + doc/board/advantech/imx8qm-rom7720-a1.rst | 3 +- doc/board/congatec/cgtqmx8.rst | 3 +- doc/board/nxp/imx8qxp_mek.rst | 2 +- 25 files changed, 632 insertions(+), 15 deletions(-) create mode 100644 arch/arm/dts/imx8qm-u-boot.dtsi
Signature · 1 line
2.17.1
PATCH v5 1/1 imx: imx8qm-rom7720: switch to binman
Switch to use binman to pack images
---
Changes for v5:
- renamed ftd to @fdt-SEQ
Changes for v4
- remove hardcoded dtb filename
- added CONFIG_FIT_EXTERNAL_OFFSET
Changes for v3
- just rebased to master
Changes for v2
- just rebased to master
arch/arm/dts/imx8qm-rom7720-a1.dts | 1 + arch/arm/dts/imx8qm-u-boot.dtsi | 133 ++++++++++++++++++ arch/arm/mach-imx/imx8/Kconfig | 1 + .../advantech/imx8qm_rom7720_a1/imximage.cfg | 4 +- configs/imx8qm_rom7720_a1_4G_defconfig | 3 +- doc/board/advantech/imx8qm-rom7720-a1.rst | 3 +- 6 files changed, 140 insertions(+), 5 deletions(-) create mode 100644 arch/arm/dts/imx8qm-u-boot.dtsi
arch/arm/dts/imx8qm-rom7720-a1.dts +1 -0
@@ -10,6 +10,7 @@ /memreserve/ 0x80000000 0x00020000; #include "fsl-imx8qm.dtsi" +#include "imx8qm-u-boot.dtsi" / { model = "Advantech iMX8QM Qseven series";
arch/arm/dts/imx8qm-u-boot.dtsi new file +133 -0
133 lines not on this page · raw message
arch/arm/mach-imx/imx8/Kconfig +1 -0
@@ -82,6 +82,7 @@ config TARGET_CONGA_QMX8 config TARGET_IMX8QM_ROM7720_A1 bool "Support i.MX8QM ROM-7720-A1" + select BINMAN select BOARD_LATE_INIT select SUPPORT_SPL select IMX8QM
board/advantech/imx8qm_rom7720_a1/imximage.cfg +2 -2
@@ -4,8 +4,8 @@ */ -/* Boot from SD, sector size 0x400 */ -BOOT_FROM SD 0x400 +BOOT_FROM sd + /* SoC type IMX8QM */ SOC_TYPE IMX8QM /* Append seco container image */
configs/imx8qm_rom7720_a1_4G_defconfig +2 -1
@@ -20,8 +20,9 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 CONFIG_REMAKE_ELF=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_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="mmc dev ${mmcdev}; if mmc rescan; then if run loadbootscript; then run bootscript; else if run loadimage; then run mmcboot; else run netboot; fi; fi; else booti ${loadaddr} - ${fdt_addr}; fi"
doc/board/advantech/imx8qm-rom7720-a1.rst +1 -2
@@ -57,8 +57,7 @@ Build U-Boot $ export ATF_LOAD_ADDR=0x80000000 $ export BL33_LOAD_ADDR=0x80020000 $ make imx8qm_rom7720_a1_4G_defconfig - $ make u-boot.bin - $ make flash.bin + $ make Flash the binary into the SD card ---------------------------------
Signature · 1 line
2.17.1
PATCH v6 1/1 imx: imx8qm: cgtqmx8: switch to binman
In reply to Oliver GrauteSwitch to use binman to pack images
---
Changes for v6
- added CONFIG_SPL_BINMAN_UBOOT_SYMBOLS is not set
Changes for v5
- added CONFIG_FIT_EXTERNAL_OFFSET
Changes for v4
- rebased on master
Changes for v3
-added Reviewed-by
- rebased on master
arch/arm/dts/imx8qm-cgtqmx8.dts | 1 + arch/arm/mach-imx/imx8/Kconfig | 1 + board/congatec/cgtqmx8/imximage.cfg | 4 ++-- configs/cgtqmx8_defconfig | 4 +++- doc/board/congatec/cgtqmx8.rst | 3 +-- 5 files changed, 8 insertions(+), 5 deletions(-)
arch/arm/dts/imx8qm-cgtqmx8.dts +1 -0
@@ -12,6 +12,7 @@ /memreserve/ 0x80000000 0x00020000; #include "fsl-imx8qm.dtsi" +#include "imx8qm-u-boot.dtsi" / { model = "Congatec QMX8 Qseven series";
arch/arm/mach-imx/imx8/Kconfig +1 -0
@@ -76,6 +76,7 @@ config TARGET_IMX8QM_MEK config TARGET_CONGA_QMX8 bool "Support congatec conga-QMX8 board" + select BINMAN select BOARD_LATE_INIT select SUPPORT_SPL select IMX8QM
board/congatec/cgtqmx8/imximage.cfg +2 -2
@@ -4,8 +4,8 @@ */ -/* Boot from SD, sector size 0x400 */ -BOOT_FROM SD 0x400 +BOOT_FROM sd + /* SoC type IMX8QM */ SOC_TYPE IMX8QM /* Append seco container image */
configs/cgtqmx8_defconfig +3 -1
@@ -20,8 +20,10 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 CONFIG_REMAKE_ELF=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_SPL_BINMAN_UBOOT_SYMBOLS is not set CONFIG_OF_BOARD_SETUP=y CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y
doc/board/congatec/cgtqmx8.rst +1 -2
@@ -57,8 +57,7 @@ Build U-Boot $ export ATF_LOAD_ADDR=0x80000000 $ export BL33_LOAD_ADDR=0x80020000 $ make cgtqmx8_defconfig - $ make u-boot.bin - $ make flash.bin + $ make Flash the binary into the SD card ---------------------------------
Signature · 1 line
2.17.1
PATCH 1/1 imx: imx8qxp: imx8qxp_mek switch to binman
In reply to Oliver GrauteSwitch to use binman pack images
--- arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi | 127 +++++++++++++++++++++++ arch/arm/mach-imx/imx8/Kconfig | 1 + board/freescale/imx8qxp_mek/imximage.cfg | 3 +- configs/imx8qxp_mek_defconfig | 2 + doc/board/nxp/imx8qxp_mek.rst | 2 +- 5 files changed, 132 insertions(+), 3 deletions(-)
arch/arm/dts/fsl-imx8qxp-mek-u-boot.dtsi +127 -0
@@ -3,6 +3,133 @@ * Copyright 2018, 2021 NXP */ +/ { + binman: binman { + multiple-images; + }; +}; + +&binman { + u-boot-spl-ddr { + align = <4>; + align-size = <4>; + filename = "u-boot-spl-ddr.bin"; + pad-byte = <0xff>; + + u-boot-spl { + align-end = <4>; + filename = "u-boot-spl.bin"; + }; + }; + + spl { + filename = "spl.bin"; + + mkimage { + args = "-n spl/u-boot-spl.cfgout -T imx8image -e 0x100000"; + + blob { + filename = "u-boot-spl-ddr.bin"; + }; + }; + }; + + itb { + filename = "u-boot.itb"; + + fit { + description = "Configuration to load ATF before U-Boot"; + fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>; + fit,fdt-list = "of-list"; + #address-cells = <1>; + + images { + uboot { + arch = "arm64"; + compression = "none"; + description = "U-Boot (64-bit)"; + load = <CONFIG_SYS_TEXT_BASE>; + type = "standalone"; + + uboot-blob { + filename = "u-boot-nodtb.bin"; + type = "blob-ext"; + }; + }; + + atf { + arch = "arm64"; + compression = "none"; + description = "ARM Trusted Firmware"; + entry = <0x00910000>; + load = <0x00091000>; + type = "firmware"; + + atf-blob { + filename = "bl31.bin"; + type = "atf-bl31"; + }; + }; + + scfw { + arch = "arm64"; + compression = "none"; + description = "System Controler Firmware"; + type = "firmware"; + + scfw_blob { + filename = "mx8qx-mek-scfw-tcm.bin"; + type = "blob-ext"; + }; + }; + + seco { + arch = "arm64"; + compression = "none"; + description = "Seco Firmware"; + type = "firmware"; + + seco_blob { + filename = "mx8qxc0-ahab-container.img"; + type = "blob-ext"; + }; + }; + + fdt { + type = "flat_dt"; + compression = "none"; + + uboot-fdt-blob { + filename = "u-boot.dtb"; + type = "blob-ext"; + }; + }; + }; + + configurations { + default = "conf"; + + conf { + fdt = "fdt"; + firmware = "uboot"; + loadables = "atf"; + }; + }; + }; + }; + + imx-boot { + filename = "flash.bin"; + pad-byte = <0x00>; + + spl { + filename = "spl.bin"; + offset = <0x0>; + type = "blob-ext"; + }; + }; +}; + &{/imx8qx-pm} { u-boot,dm-spl;
arch/arm/mach-imx/imx8/Kconfig +1 -0
@@ -90,6 +90,7 @@ config TARGET_IMX8QM_ROM7720_A1 config TARGET_IMX8QXP_MEK bool "Support i.MX8QXP MEK board" + select BINMAN select BOARD_LATE_INIT select IMX8QXP select FSL_CAAM
board/freescale/imx8qxp_mek/imximage.cfg +1 -2
@@ -7,8 +7,7 @@ */ -/* Boot from SD, sector size 0x400 */ -BOOT_FROM SD 0x400 +BOOT_FROM sd /* SoC type IMX8QX */ SOC_TYPE IMX8QX /* Append seco container image */
configs/imx8qxp_mek_defconfig +2 -0
@@ -23,6 +23,8 @@ CONFIG_SYS_LOAD_ADDR=0x80280000 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 CONFIG_REMAKE_ELF=y +CONFIG_FIT=y +CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_OF_BOARD_SETUP=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_BOOTDELAY=3
doc/board/nxp/imx8qxp_mek.rst +1 -1
@@ -50,7 +50,7 @@ Build U-Boot .. code-block:: bash $ make imx8qxp_mek_defconfig - $ make flash.bin + $ make Flash the binary into the SD card ---------------------------------
Signature · 1 line
2.17.1
PATCH v2 1/1 imx: imx8qm: imx8qm_mek switch to binman
In reply to Oliver Graute--- arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi | 2 ++ arch/arm/mach-imx/imx8/Kconfig | 1 + board/freescale/imx8qm_mek/README | 2 +- configs/imx8qm_2ek_defconfig | 2 ++ 4 files changed, 6 insertions(+), 1 deletion(-)
arch/arm/dts/fsl-imx8qm-mek-u-boot.dtsi +2 -0
@@ -3,6 +3,8 @@ * Copyright 2018, 2021 NXP */ +#include "imx8qm-u-boot.dtsi" + &{/imx8qm-pm} { u-boot,dm-spl;
arch/arm/mach-imx/imx8/Kconfig +1 -0
@@ -68,6 +68,7 @@ config TARGET_GIEDI config TARGET_IMX8QM_MEK bool "Support i.MX8QM MEK board" + select BINMAN select BOARD_LATE_INIT select IMX8QM select FSL_CAAM
board/freescale/imx8qm_mek/README +1 -1
@@ -40,7 +40,7 @@ And copy the following firmwares to U-Boot folder: Build U-Boot ============ $ make imx8qm_mek_defconfig -$ make flash.bin +$ make Flash the binary into the SD card =================================
configs/imx8qm_mek_defconfig +2 -0
@@ -23,6 +23,8 @@ CONFIG_SYS_LOAD_ADDR=0x80280000 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 CONFIG_REMAKE_ELF=y +CONFIG_FIT=y +CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_OF_BOARD_SETUP=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_BOOTDELAY=3
Signature · 1 line
2.17.1
PATCH 1/1 imx: imx8qxp: giedi switch to binman
In reply to Oliver Graute--- arch/arm/dts/imx8qxp-capricorn-u-boot.dtsi | 127 +++++++++++++++++++++ arch/arm/mach-imx/imx8/Kconfig | 1 + board/siemens/capricorn/imximage.cfg | 2 +- configs/giedi_defconfig | 2 + 4 files changed, 131 insertions(+), 1 deletion(-)
arch/arm/dts/imx8qxp-capricorn-u-boot.dtsi +127 -0
@@ -3,6 +3,133 @@ * Copyright 2019 Siemens AG */ +/ { + binman: binman { + multiple-images; + }; +}; + +&binman { + u-boot-spl-ddr { + align = <4>; + align-size = <4>; + filename = "u-boot-spl-ddr.bin"; + pad-byte = <0xff>; + + u-boot-spl { + align-end = <4>; + filename = "u-boot-spl.bin"; + }; + }; + + spl { + filename = "spl.bin"; + + mkimage { + args = "-n spl/u-boot-spl.cfgout -T imx8image -e 0x100000"; + + blob { + filename = "u-boot-spl-ddr.bin"; + }; + }; + }; + + itb { + filename = "u-boot.itb"; + + fit { + description = "Configuration to load ATF before U-Boot"; + fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>; + fit,fdt-list = "of-list"; + #address-cells = <1>; + + images { + uboot { + arch = "arm64"; + compression = "none"; + description = "U-Boot (64-bit)"; + load = <CONFIG_SYS_TEXT_BASE>; + type = "standalone"; + + uboot-blob { + filename = "u-boot-nodtb.bin"; + type = "blob-ext"; + }; + }; + + atf { + arch = "arm64"; + compression = "none"; + description = "ARM Trusted Firmware"; + entry = <0x00910000>; + load = <0x00091000>; + type = "firmware"; + + atf-blob { + filename = "bl31.bin"; + type = "atf-bl31"; + }; + }; + + scfw { + arch = "arm64"; + compression = "none"; + description = "System Controler Firmware"; + type = "firmware"; + + scfw_blob { + filename = "mx8qx-mek-scfw-tcm.bin"; + type = "blob-ext"; + }; + }; + + seco { + arch = "arm64"; + compression = "none"; + description = "Seco Firmware"; + type = "firmware"; + + seco_blob { + filename = "mx8qxc0-ahab-container.img"; + type = "blob-ext"; + }; + }; + + fdt { + type = "flat_dt"; + compression = "none"; + + uboot-fdt-blob { + filename = "u-boot.dtb"; + type = "blob-ext"; + }; + }; + }; + + configurations { + default = "conf"; + + conf { + fdt = "fdt"; + firmware = "uboot"; + loadables = "atf"; + }; + }; + }; + }; + + imx-boot { + filename = "flash.bin"; + pad-byte = <0x00>; + + spl { + filename = "spl.bin"; + offset = <0x0>; + type = "blob-ext"; + }; + }; +}; + &{/imx8qx-pm} { u-boot,dm-spl;
arch/arm/mach-imx/imx8/Kconfig +1 -0
@@ -62,6 +62,7 @@ config TARGET_DENEB config TARGET_GIEDI bool "Support i.MX8QXP Capricorn Giedi board" + select BINMAN select BOARD_LATE_INIT select FACTORYSET select IMX8QXP
board/siemens/capricorn/imximage.cfg +1 -1
@@ -8,7 +8,7 @@ /* Boot from SD, sector size 0x400 */ -BOOT_FROM SD 0x400 +BOOT_FROM sd /* SoC type IMX8QX */ SOC_TYPE IMX8QX /* Append seco container image */
configs/giedi_defconfig +2 -0
@@ -26,6 +26,8 @@ CONFIG_SYS_LOAD_ADDR=0x80280000 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 CONFIG_REMAKE_ELF=y +CONFIG_FIT=y +CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_OF_BOARD_SETUP=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_BOOTDELAY=3
Signature · 1 line
2.17.1
PATCH 1/1 imx: imx8qxp: deneb switch to binman
In reply to Oliver Graute--- arch/arm/mach-imx/imx8/Kconfig | 1 + configs/deneb_defconfig | 2 ++ 2 files changed, 3 insertions(+)
arch/arm/mach-imx/imx8/Kconfig +1 -0
@@ -56,6 +56,7 @@ config TARGET_COLIBRI_IMX8X config TARGET_DENEB bool "Support i.MX8QXP Capricorn Deneb board" + select BINMAN select BOARD_LATE_INIT select FACTORYSET select IMX8QXP
configs/deneb_defconfig +2 -0
@@ -26,6 +26,8 @@ CONFIG_SYS_LOAD_ADDR=0x80280000 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 CONFIG_REMAKE_ELF=y +CONFIG_FIT=y +CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_OF_BOARD_SETUP=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_BOOTDELAY=3
Signature · 1 line
2.17.1
PATCH 1/1 imx: imx8x: colibri: switch to binman
In reply to Oliver Graute--- arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi | 104 +++++++++++++++++++ arch/arm/mach-imx/imx8/Kconfig | 1 + configs/colibri-imx8x_defconfig | 1 + 3 files changed, 106 insertions(+)
arch/arm/dts/fsl-imx8qxp-colibri-u-boot.dtsi +104 -0
@@ -2,6 +2,110 @@ /* * Copyright 2019 Toradex AG */ +/ { + binman: binman { + multiple-images; + }; +}; + +&binman { + + itb { + filename = "u-boot.itb"; + + fit { + description = "Configuration to load ATF before U-Boot"; + fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>; + fit,fdt-list = "of-list"; + #address-cells = <1>; + + images { + uboot { + arch = "arm64"; + compression = "none"; + description = "U-Boot (64-bit)"; + load = <CONFIG_SYS_TEXT_BASE>; + type = "standalone"; + + uboot-blob { + filename = "u-boot-nodtb.bin"; + type = "blob-ext"; + }; + }; + + atf { + arch = "arm64"; + compression = "none"; + description = "ARM Trusted Firmware"; + entry = <0x00910000>; + load = <0x00091000>; + type = "firmware"; + + atf-blob { + filename = "bl31.bin"; + type = "atf-bl31"; + }; + }; + + scfw { + arch = "arm64"; + compression = "none"; + description = "System Controler Firmware"; + type = "firmware"; + + scfw_blob { + filename = "mx8qx-colibri-scfw-tcm.bin"; + type = "blob-ext"; + }; + }; + + seco { + arch = "arm64"; + compression = "none"; + description = "Seco Firmware"; + type = "firmware"; + + seco_blob { + filename = "mx8qx-ahab-container.img"; + type = "blob-ext"; + }; + }; + + fdt { + type = "flat_dt"; + compression = "none"; + + uboot-fdt-blob { + filename = "u-boot.dtb"; + type = "blob-ext"; + }; + }; + }; + + configurations { + default = "conf"; + + conf { + fdt = "fdt"; + firmware = "uboot"; + loadables = "atf"; + }; + }; + }; + }; + + imx-boot { + filename = "flash.bin"; + pad-byte = <0x00>; + + spl { + filename = "spl.bin"; + offset = <0x0>; + type = "blob-ext"; + }; + }; + +}; &{/imx8qx-pm} {
arch/arm/mach-imx/imx8/Kconfig +1 -0
@@ -51,6 +51,7 @@ config TARGET_APALIS_IMX8 config TARGET_COLIBRI_IMX8X bool "Support Colibri iMX8X module" + select BINMAN select BOARD_LATE_INIT select IMX8QXP
configs/colibri-imx8x_defconfig +1 -0
@@ -17,6 +17,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 CONFIG_REMAKE_ELF=y CONFIG_FIT=y +CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_FIT_VERBOSE=y CONFIG_LOG=y # CONFIG_DISPLAY_BOARDINFO is not set
Signature · 1 line
2.17.1
PATCH 1/1 imx: imx8: apalis: switch to binman
In reply to Oliver Graute--- arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi | 104 +++++++++++++++++++++ arch/arm/mach-imx/imx8/Kconfig | 1 + configs/apalis-imx8_defconfig | 1 + 3 files changed, 106 insertions(+)
arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi +104 -0
@@ -3,6 +3,110 @@ * Copyright 2019 Toradex AG */ +/ { + binman: binman { + multiple-images; + }; +}; + +&binman { + + itb { + filename = "u-boot.itb"; + + fit { + description = "Configuration to load ATF before U-Boot"; + fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>; + fit,fdt-list = "of-list"; + #address-cells = <1>; + + images { + uboot { + arch = "arm64"; + compression = "none"; + description = "U-Boot (64-bit)"; + load = <CONFIG_SYS_TEXT_BASE>; + type = "standalone"; + + uboot-blob { + filename = "u-boot-nodtb.bin"; + type = "blob-ext"; + }; + }; + + atf { + arch = "arm64"; + compression = "none"; + description = "ARM Trusted Firmware"; + entry = <0x00910000>; + load = <0x00091000>; + type = "firmware"; + + atf-blob { + filename = "bl31.bin"; + type = "atf-bl31"; + }; + }; + + scfw { + arch = "arm64"; + compression = "none"; + description = "System Controler Firmware"; + type = "firmware"; + + scfw_blob { + filename = "mx8qm-apalis-scfw-tcm.bin"; + type = "blob-ext"; + }; + }; + + seco { + arch = "arm64"; + compression = "none"; + description = "Seco Firmware"; + type = "firmware"; + + seco_blob { + filename = "ahab-container.img"; + type = "blob-ext"; + }; + }; + + fdt { + type = "flat_dt"; + compression = "none"; + + uboot-fdt-blob { + filename = "u-boot.dtb"; + type = "blob-ext"; + }; + }; + }; + + configurations { + default = "conf"; + + conf { + fdt = "fdt"; + firmware = "uboot"; + loadables = "atf"; + }; + }; + }; + }; + + imx-boot { + filename = "flash.bin"; + pad-byte = <0x00>; + + spl { + filename = "spl.bin"; + offset = <0x0>; + type = "blob-ext"; + }; + }; +}; + &mu { u-boot,dm-pre-proper; };
arch/arm/mach-imx/imx8/Kconfig +1 -0
@@ -46,6 +46,7 @@ choice config TARGET_APALIS_IMX8 bool "Support Apalis iMX8 module" + select BINMAN select BOARD_LATE_INIT select IMX8QM
configs/apalis-imx8_defconfig +1 -0
@@ -17,6 +17,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 CONFIG_REMAKE_ELF=y CONFIG_FIT=y +CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_FIT_VERBOSE=y CONFIG_OF_SYSTEM_SETUP=y CONFIG_LOG=y
Signature · 1 line
2.17.1
Fabio Estevam
reviewerRe: [PATCH v1] imx: imx8: apalis: switch to binman
On Wed, Nov 2, 2022 at 12:59 PM Oliver Graute
<[email protected]> wrote:
Please add a commit log.
arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi line 19
Quoted 10 lines
Signed-off-by Oliver Graute <[email protected]>+&binman {
arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi +7
-0+ + itb { + filename = "u-boot.itb"; + + fit { + description = "Configuration to load ATF before U-Boot"; + fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
Can't all boards use the common the binman nodes from arch/arm/dts/imx8qm-u-boot.dtsi instead?
Re: [PATCH v1] imx: imx8: apalis: switch to binman
Quoted 4 lines · Fabio Estevam
On Wed, Nov 2, 2022 at 12:59 PM Oliver Graute
<[email protected]> wrote:Please add a commit log.
ok
Quoted 14 lines
arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi line 19
Quoted 11 lines
Signed-off-by Oliver Graute <[email protected]>+&binman {
arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi +7
-0+ + itb { + filename = "u-boot.itb"; + + fit { + description = "Configuration to load ATF before U-Boot"; + fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;Can't all boards use the common the binman nodes from
arch/arm/dts/imx8qm-u-boot.dtsiinstead?
I'am about to try that but I run into the following error:
binman: Filename 'spl/u-boot-spl.bin' not found in input path (.,.,./board/toradex/apalis-imx8,arch/arm/dts) (cwd='/home/graute/u-boot-upstream') Makefile:1109: recipe for target 'all' failed
make: *** [all] Error 1
The error disappear if I remove binman/u-boot-spl-ddr and binman/spl node in the common file.
So some of these boards needs the binman/u-boot-spl-ddr and binman/spl node and others not. What is the proper solution to deal with this difference here?
Best regards,
Oliver
Fabio Estevam
reviewerRe: [PATCH v1] imx: imx8: apalis: switch to binman
Hi Oliver,
Quoted 9 lines · Oliver Graute
Quoted 2 lines
Can't all boards use the common the binman nodes from
arch/arm/dts/imx8qm-u-boot.dtsiinstead?I'am about to try that but I run into the following error:
binman: Filename 'spl/u-boot-spl.bin' not found in input path (.,.,./board/toradex/apalis-imx8,arch/arm/dts) (cwd='/home/graute/u-boot-upstream') Makefile:1109: recipe for target 'all' failed
make: *** [all] Error 1
Quoted 6 lines
The error disappear if I remove binman/u-boot-spl-ddr and binman/spl node in the common file.
So some of these boards needs the binman/u-boot-spl-ddr and binman/spl node and others not. What is the proper solution to deal with this difference here?
Looking inside configs/apalis-imx8_defconfig, I see it does not use SPL. That's why 'spl/u-boot-spl.bin' is not present.
I think you should protect the binman/u-boot-spl-ddr and binman/spl nodes by adding #ifdef CONFIG_SPL.
Re: [PATCH v1] imx: imx8: apalis: switch to binman
Quoted 20 lines · Fabio Estevam
Hi Oliver,
Quoted 9 lines · Oliver Graute
Quoted 2 lines
Can't all boards use the common the binman nodes from
arch/arm/dts/imx8qm-u-boot.dtsiinstead?I'am about to try that but I run into the following error:
binman: Filename 'spl/u-boot-spl.bin' not found in input path (.,.,./board/toradex/apalis-imx8,arch/arm/dts) (cwd='/home/graute/u-boot-upstream') Makefile:1109: recipe for target 'all' failed
make: *** [all] Error 1Quoted 6 lines
The error disappear if I remove binman/u-boot-spl-ddr and binman/spl node in the common file.
So some of these boards needs the binman/u-boot-spl-ddr and binman/spl node and others not. What is the proper solution to deal with this difference here?
Quoted 5 lines
Looking inside configs/apalis-imx8_defconfig, I see it does not use SPL. That's why 'spl/u-boot-spl.bin' is not present.
I think you should protect the binman/u-boot-spl-ddr and binman/spl nodes by adding #ifdef
CONFIG_SPL.
ok thx
Best Regards,
Oliver
Re: [PATCH v1] imx: imx8: apalis: switch to binman
In reply to Oliver GrauteQuoted 29 lines · Oliver Graute
Quoted 4 lines · Fabio Estevam
On Wed, Nov 2, 2022 at 12:59 PM Oliver Graute
<[email protected]> wrote:Please add a commit log.
ok
Quoted 14 lines
arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi line 19
Quoted 11 lines
Signed-off-by Oliver Graute <[email protected]>+&binman {
arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi +7
-0+ + itb { + filename = "u-boot.itb"; + + fit { + description = "Configuration to load ATF before U-Boot"; + fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;Can't all boards use the common the binman nodes from
arch/arm/dts/imx8qm-u-boot.dtsiinstead?I'am about to try that but I run into the following error:
binman: Filename 'spl/u-boot-spl.bin' not found in input path (.,.,./board/toradex/apalis-imx8,arch/arm/dts) (cwd='/home/graute/u-boot-upstream') Makefile:1109: recipe for target 'all' failed
make: *** [all] Error 1
Quoted 6 lines
The error disappear if I remove binman/u-boot-spl-ddr and binman/spl node in the common file.
So some of these boards needs the binman/u-boot-spl-ddr and binman/spl node and others not. What is the proper solution to deal with this difference here?
according to this commit there are indeed different requirements:
commit 8e0d963b19adfb98e8c7c941f44e0f36e9f91303
Author: Peng Fan <[email protected]> Date: Fri Dec 21 06:21:26 2018 +0000
dts: imx8qxp-mek: introduce u-boot dtsi
Introduce u-boot dtsi for i.MX8QXP MEK board.
we do not introduce a common dtsi for SoC, because different board has different requirement on which needs to be enabled in SPL DM.
So any proposal?
Best regards,
Oliver
Fabio Estevam
reviewerQuoted 12 lines · Oliver Graute
This patchsets switches the remaining imx8 boards to binman.
Oliver Graute (8):
imx: imx8qm-rom7720: switch to binman
imx: imx8qm: cgtqmx8: switch to binman
imx: imx8qxp:imx8qxp_mekswitch to binman
imx: imx8qm:imx8qm_mekswitch to binman
imx: imx8qxp: giedi switch to binman
imx: imx8qxp: deneb switch to binman
imx: imx8x: colibri: switch to binman
imx: imx8: apalis: switch to binman
Your patches are not numbered. I expect to see 1/8, 2/8, ...8/8.
git format-patch -8 does the trick.