[RFC] imx: imx8qm-rom7720: switch to binman
Switch to use binman to pack images
---
Run into this issue on the first try to get binman working:
make[1]: Nothing to be done for 'SPL'. BINMAN flash.bin MKIMAGE flash.bin Error: spl/u-boot-spl.cfgout[16] - Invalid command (LOADER) arch/arm/mach-imx/Makefile:190: recipe for target 'flash.bin' failed make[1]: *** [flash.bin] Error 1 make[1]: *** Deleting file 'flash.bin' Makefile:1519: recipe for target 'flash.bin' failed make: *** [flash.bin] Error 2
Some clue howto fix that?
arch/arm/dts/imx8qm-rom7720-a1.dts | 1 + arch/arm/dts/imx8qm-u-boot.dtsi | 95 +++++++++++++++++++ arch/arm/mach-imx/imx8/Kconfig | 1 + .../advantech/imx8qm_rom7720_a1/imximage.cfg | 16 +--- configs/imx8qm_rom7720_a1_4G_defconfig | 2 +- 5 files changed, 100 insertions(+), 15 deletions(-) create mode 100644 arch/arm/dts/imx8qm-u-boot.dtsi
diff --git a/arch/arm/dts/imx8qm-rom7720-a1.dts b/arch/arm/dts/imx8qm-rom7720-a1.dts index d1f2fff869..332d441c6d 100644 --- a/arch/arm/dts/imx8qm-rom7720-a1.dts +++ b/arch/arm/dts/imx8qm-rom7720-a1.dts @@ -10,6 +10,7 @@ /memreserve/ 0x80000000 0x00020000;
#include "fsl-imx8qm.dtsi" +#include "imx8qm-u-boot.dtsi"
/ { model = "Advantech iMX8QM Qseven series"; diff --git a/arch/arm/dts/imx8qm-u-boot.dtsi b/arch/arm/dts/imx8qm-u-boot.dtsi new file mode 100644 index 0000000000..77e5cd6989 --- /dev/null +++ b/arch/arm/dts/imx8qm-u-boot.dtsi @@ -0,0 +1,95 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2021 NXP + */ + +/ { + binman: binman { + multiple-images; + }; + +}; + +&binman { + u-boot-nodtb { + filename = "u-boot-nodtb.bin"; + pad-byte = <0xff>; + align-size = <4>; + align = <4>; + + u-boot-spl { + align-end = <4>; + }; + + }; + + flash { + mkimage { + args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x100000"; + + blob { + filename = "u-boot-nodtb.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>; + + 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 = <0x80000000>; + entry = <0x80000000>; + + atf_blob: blob-ext { + filename = "bl31.bin"; + }; + }; + + fdt { + description = "imx8qm-rom7720-a1"; + type = "flat_dt"; + compression = "none"; + + uboot_fdt_blob: blob-ext { + filename = "u-boot.dtb"; + }; + }; + }; + + configurations { + default = "conf"; + + conf { + description = "imx8qm-rom7720-a1"; + firmware = "uboot"; + loadables = "atf"; + fdt = "fdt"; + }; + }; + }; + }; +}; diff --git a/arch/arm/mach-imx/imx8/Kconfig b/arch/arm/mach-imx/imx8/Kconfig index b43739e5c6..b42b985cdf 100644 --- a/arch/arm/mach-imx/imx8/Kconfig +++ b/arch/arm/mach-imx/imx8/Kconfig @@ -81,6 +81,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 diff --git a/board/advantech/imx8qm_rom7720_a1/imximage.cfg b/board/advantech/imx8qm_rom7720_a1/imximage.cfg index e324c7ca37..30556ff9d7 100644 --- a/board/advantech/imx8qm_rom7720_a1/imximage.cfg +++ b/board/advantech/imx8qm_rom7720_a1/imximage.cfg @@ -5,17 +5,5 @@
#define __ASSEMBLY__
-/* Boot from SD, sector size 0x400 */ -BOOT_FROM SD 0x400 -/* SoC type IMX8QM */ -SOC_TYPE IMX8QM -/* Append seco container image */ -APPEND mx8qm-ahab-container.img -/* Create the 2nd container */ -CONTAINER -/* Add scfw image with exec attribute */ -IMAGE SCU mx8qm-val-scfw-tcm.bin -/* Add ATF image with exec attribute */ -IMAGE A35 bl31.bin 0x80000000 -/* Add U-Boot image with load attribute */ -DATA A35 u-boot-dtb.bin 0x80020000 +BOOT_FROM sd +LOADER u-boot-dtb.bin 0x10000 diff --git a/configs/imx8qm_rom7720_a1_4G_defconfig b/configs/imx8qm_rom7720_a1_4G_defconfig index fb43fa1962..07ea6e191d 100644 --- a/configs/imx8qm_rom7720_a1_4G_defconfig +++ b/configs/imx8qm_rom7720_a1_4G_defconfig @@ -18,7 +18,7 @@ CONFIG_SPL=y CONFIG_SYS_LOAD_ADDR=0x80280000 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y -CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" +# CONFIG_SPL_FIT_GENERATOR is not set CONFIG_BOOTDELAY=3 CONFIG_LOG=y CONFIG_BOARD_EARLY_INIT_F=y
Hello Oliver,
-----Original Message----- From: Oliver Graute oliver.graute@kococonnector.com Sent: Monday, January 10, 2022 11:31 AM To: Oliver Graute oliver.graute@kococonnector.com; Stefano Babic sbabic@denx.de; Fabio Estevam festevam@gmail.com; NXP i.MX U-Boot Team uboot-imx@nxp.com Cc: aford173@gmail.com; peng.fan@nxp.com; marcel.ziswiler@toradex.com; tharvey@gateworks.com; ZHIZHIKIN Andrey andrey.zhizhikin@leica-geosystems.com; u-boot@lists.denx.de Subject: [RFC] imx: imx8qm-rom7720: switch to binman
Switch to use binman to pack images
Please don't forget S-o-B, checkpatch does complain about it. ;)
Run into this issue on the first try to get binman working:
make[1]: Nothing to be done for 'SPL'. BINMAN flash.bin MKIMAGE flash.bin Error: spl/u-boot-spl.cfgout[16] - Invalid command (LOADER) arch/arm/mach-imx/Makefile:190: recipe for target 'flash.bin' failed make[1]: *** [flash.bin] Error 1 make[1]: *** Deleting file 'flash.bin' Makefile:1519: recipe for target 'flash.bin' failed make: *** [flash.bin] Error 2
Some clue howto fix that?
This might be due to the fact that you're using the same u-boot-nodtb.bin binary twice: once in binman section, and once in ITB. You can try to rename the binman entry to a different name, this might do the trick. See [1] for sample of imx8mq_evk conversion.
arch/arm/dts/imx8qm-rom7720-a1.dts | 1 + arch/arm/dts/imx8qm-u-boot.dtsi | 95 +++++++++++++++++++ arch/arm/mach-imx/imx8/Kconfig | 1 + .../advantech/imx8qm_rom7720_a1/imximage.cfg | 16 +--- configs/imx8qm_rom7720_a1_4G_defconfig | 2 +-
Is there any documentation available for this board that needs adaptions with new build instructions? I was not able to locate any doc for this board at all...
5 files changed, 100 insertions(+), 15 deletions(-) create mode 100644 arch/arm/dts/imx8qm-u-boot.dtsi
diff --git a/arch/arm/dts/imx8qm-rom7720-a1.dts b/arch/arm/dts/imx8qm-rom7720- a1.dts index d1f2fff869..332d441c6d 100644 --- a/arch/arm/dts/imx8qm-rom7720-a1.dts +++ b/arch/arm/dts/imx8qm-rom7720-a1.dts @@ -10,6 +10,7 @@ /memreserve/ 0x80000000 0x00020000;
#include "fsl-imx8qm.dtsi" +#include "imx8qm-u-boot.dtsi"
/ { model = "Advantech iMX8QM Qseven series"; diff --git a/arch/arm/dts/imx8qm-u-boot.dtsi b/arch/arm/dts/imx8qm-u-boot.dtsi new file mode 100644 index 0000000000..77e5cd6989 --- /dev/null +++ b/arch/arm/dts/imx8qm-u-boot.dtsi @@ -0,0 +1,95 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*
- Copyright 2021 NXP
- */
+/ {
binman: binman {multiple-images;};+};
+&binman {
u-boot-nodtb {filename = "u-boot-nodtb.bin";pad-byte = <0xff>;align-size = <4>;align = <4>;u-boot-spl {align-end = <4>;};
What I see is missing in this section is SECO and SCFW binaries.
Can i.MX8QM boot without those? Otherwise generated image will be unusable.
};flash {mkimage {args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e0x100000";
blob {filename = "u-boot-nodtb.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>;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 = <0x80000000>;entry = <0x80000000>;atf_blob: blob-ext {filename = "bl31.bin";};};fdt {description = "imx8qm-rom7720-a1";
You can use "NAME" here I suppose.
type = "flat_dt";compression = "none";uboot_fdt_blob: blob-ext {filename = "u-boot.dtb";};};};configurations {default = "conf";conf {description = "imx8qm-rom7720-a1";
And as well here, "NAME".
firmware = "uboot";loadables = "atf";fdt = "fdt";};};};};+};
This binman configuration suggests that there are 2 binaries that should be populated onto the bootable media: flash.bin and u-boot.itb. Can you please convert them to use a single binary? Sample code for this is also in [1].
diff --git a/arch/arm/mach-imx/imx8/Kconfig b/arch/arm/mach-imx/imx8/Kconfig index b43739e5c6..b42b985cdf 100644 --- a/arch/arm/mach-imx/imx8/Kconfig +++ b/arch/arm/mach-imx/imx8/Kconfig @@ -81,6 +81,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 IMX8QMdiff --git a/board/advantech/imx8qm_rom7720_a1/imximage.cfg b/board/advantech/imx8qm_rom7720_a1/imximage.cfg index e324c7ca37..30556ff9d7 100644 --- a/board/advantech/imx8qm_rom7720_a1/imximage.cfg +++ b/board/advantech/imx8qm_rom7720_a1/imximage.cfg @@ -5,17 +5,5 @@
#define __ASSEMBLY__
-/* Boot from SD, sector size 0x400 */ -BOOT_FROM SD 0x400 -/* SoC type IMX8QM */ -SOC_TYPE IMX8QM -/* Append seco container image */ -APPEND mx8qm-ahab-container.img -/* Create the 2nd container */ -CONTAINER -/* Add scfw image with exec attribute */ -IMAGE SCU mx8qm-val-scfw-tcm.bin -/* Add ATF image with exec attribute */ -IMAGE A35 bl31.bin 0x80000000 -/* Add U-Boot image with load attribute */ -DATA A35 u-boot-dtb.bin 0x80020000 +BOOT_FROM sd +LOADER u-boot-dtb.bin 0x10000 diff --git a/configs/imx8qm_rom7720_a1_4G_defconfig b/configs/imx8qm_rom7720_a1_4G_defconfig index fb43fa1962..07ea6e191d 100644 --- a/configs/imx8qm_rom7720_a1_4G_defconfig +++ b/configs/imx8qm_rom7720_a1_4G_defconfig @@ -18,7 +18,7 @@ CONFIG_SPL=y CONFIG_SYS_LOAD_ADDR=0x80280000 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y -CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" +# CONFIG_SPL_FIT_GENERATOR is not set CONFIG_BOOTDELAY=3 CONFIG_LOG=y CONFIG_BOARD_EARLY_INIT_F=y -- 2.17.1
-- andrey
Link: [1]: https://lore.kernel.org/u-boot/20211203161802.12699-1-andrey.zhizhikin@leica...
On 10/01/22, ZHIZHIKIN Andrey wrote:
Hello Oliver,
-----Original Message----- From: Oliver Graute oliver.graute@kococonnector.com Sent: Monday, January 10, 2022 11:31 AM To: Oliver Graute oliver.graute@kococonnector.com; Stefano Babic sbabic@denx.de; Fabio Estevam festevam@gmail.com; NXP i.MX U-Boot Team uboot-imx@nxp.com Cc: aford173@gmail.com; peng.fan@nxp.com; marcel.ziswiler@toradex.com; tharvey@gateworks.com; ZHIZHIKIN Andrey andrey.zhizhikin@leica-geosystems.com; u-boot@lists.denx.de Subject: [RFC] imx: imx8qm-rom7720: switch to binman
Switch to use binman to pack images
Please don't forget S-o-B, checkpatch does complain about it. ;)
will do it on next submission
Run into this issue on the first try to get binman working:
make[1]: Nothing to be done for 'SPL'. BINMAN flash.bin MKIMAGE flash.bin Error: spl/u-boot-spl.cfgout[16] - Invalid command (LOADER) arch/arm/mach-imx/Makefile:190: recipe for target 'flash.bin' failed make[1]: *** [flash.bin] Error 1 make[1]: *** Deleting file 'flash.bin' Makefile:1519: recipe for target 'flash.bin' failed make: *** [flash.bin] Error 2
Some clue howto fix that?
This might be due to the fact that you're using the same u-boot-nodtb.bin binary twice: once in binman section, and once in ITB. You can try to rename the binman entry to a different name, this might do the trick. See [1] for sample of imx8mq_evk conversion.
ok I think I fixed that. I dropped additionally the following statements:
make u-boot.bin make flash.bin
just make is enough here or?
But still get this warning even if CONFIG_SPL_FIT_GENERATOR is disabled.
make imx8qm_rom7720_a1_4G_defconfig && make # # configuration written to .config # scripts/kconfig/conf --syncconfig Kconfig CFG u-boot.cfg GEN include/autoconf.mk GEN include/autoconf.mk.dep CFG spl/u-boot.cfg GEN spl/include/autoconf.mk ===================== WARNING ====================== This board uses CONFIG_SPL_FIT_GENERATOR. Please migrate to binman instead, to avoid the proliferation of arch-specific scripts with no tests. ====================================================
Is there any documentation available for this board that needs adaptions with new build instructions? I was not able to locate any doc for this board at all...
You find the doc here:
doc/board/advantech/imx8qm-rom7720-a1.rst
What I see is missing in this section is SECO and SCFW binaries.
Can i.MX8QM boot without those? Otherwise generated image will be unusable.
you are right. This is still missing. Can you point me to a example with SECO and SCFW?
This binman configuration suggests that there are 2 binaries that should be populated onto the bootable media: flash.bin and u-boot.itb. Can you please convert them to use a single binary? Sample code for this is also in [1].
Link: [1]: https://lore.kernel.org/u-boot/20211203161802.12699-1-andrey.zhizhikin@leica...
thx for your suggestions
Best regards,
Oliver
Hi Oliver
On Mon, 2022-01-10 at 14:29 +0000, ZHIZHIKIN Andrey wrote:
Hello Oliver,
-----Original Message----- From: Oliver Graute oliver.graute@kococonnector.com Sent: Monday, January 10, 2022 11:31 AM To: Oliver Graute oliver.graute@kococonnector.com; Stefano Babic sbabic@denx.de; Fabio Estevam festevam@gmail.com; NXP i.MX U-Boot Team uboot-imx@nxp.com Cc: aford173@gmail.com; peng.fan@nxp.com; marcel.ziswiler@toradex.com; tharvey@gateworks.com; ZHIZHIKIN Andrey andrey.zhizhikin@leica-geosystems.com; u-boot@lists.denx.de Subject: [RFC] imx: imx8qm-rom7720: switch to binman
Switch to use binman to pack images
Please don't forget S-o-B, checkpatch does complain about it. ;)
Run into this issue on the first try to get binman working:
make[1]: Nothing to be done for 'SPL'.
You may need something similar to [1]
BINMAN flash.bin MKIMAGE flash.bin Error: spl/u-boot-spl.cfgout[16] - Invalid command (LOADER) arch/arm/mach-imx/Makefile:190: recipe for target 'flash.bin' failed make[1]: *** [flash.bin] Error 1 make[1]: *** Deleting file 'flash.bin' Makefile:1519: recipe for target 'flash.bin' failed make: *** [flash.bin] Error 2
Some clue howto fix that?
This might be due to the fact that you're using the same u-boot-nodtb.bin binary twice: once in binman section, and once in ITB. You can try to rename the binman entry to a different name, this might do the trick. See [1] for sample of imx8mq_evk conversion.
Yep, adding the imx-boot/flash.bin binman section combining them two should avoid this.
To be honest, even on imx8mm it currently fails if doing make flash.bin rather than just make which will call BINMAN ALL. I guess, that might be some kind of a remnant resp. clash with before binman stuff.
⬢[zim@toolbox u-boot.git]$ make verdin-imx8mm_defconfig ⬢[zim@toolbox u-boot.git]$ make -j12 flash.bin ... BINMAN flash.bin MKIMAGE flash.bin ./tools/mkimage: Can't open spl/u-boot-spl-ddr.bin: No such file or directory make[1]: *** [arch/arm/mach-imx/Makefile:167: flash.bin] Error 1 make[1]: *** Deleting file 'flash.bin' make: *** [Makefile:1521: flash.bin] Error 2
arch/arm/dts/imx8qm-rom7720-a1.dts | 1 + arch/arm/dts/imx8qm-u-boot.dtsi | 95 +++++++++++++++++++ arch/arm/mach-imx/imx8/Kconfig | 1 + .../advantech/imx8qm_rom7720_a1/imximage.cfg | 16 +--- configs/imx8qm_rom7720_a1_4G_defconfig | 2 +-
Is there any documentation available for this board that needs adaptions with new build instructions? I was not able to locate any doc for this board at all...
5 files changed, 100 insertions(+), 15 deletions(-) create mode 100644 arch/arm/dts/imx8qm-u-boot.dtsi
diff --git a/arch/arm/dts/imx8qm-rom7720-a1.dts b/arch/arm/dts/imx8qm-rom7720- a1.dts index d1f2fff869..332d441c6d 100644 --- a/arch/arm/dts/imx8qm-rom7720-a1.dts +++ b/arch/arm/dts/imx8qm-rom7720-a1.dts @@ -10,6 +10,7 @@ /memreserve/ 0x80000000 0x00020000;
#include "fsl-imx8qm.dtsi" +#include "imx8qm-u-boot.dtsi"
/ { model = "Advantech iMX8QM Qseven series"; diff --git a/arch/arm/dts/imx8qm-u-boot.dtsi b/arch/arm/dts/imx8qm-u-boot.dtsi new file mode 100644 index 0000000000..77e5cd6989 --- /dev/null +++ b/arch/arm/dts/imx8qm-u-boot.dtsi @@ -0,0 +1,95 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*
- Copyright 2021 NXP
- */
+/ { + binman: binman { + multiple-images; + };
Please avoid such empty lines before closing curly braces.
+};
+&binman { + u-boot-nodtb { + filename = "u-boot-nodtb.bin"; + pad-byte = <0xff>; + align-size = <4>; + align = <4>;
+ u-boot-spl { + align-end = <4>; + };
What I see is missing in this section is SECO and SCFW binaries.
Can i.MX8QM boot without those? Otherwise generated image will be unusable.
+ };
+ flash { + mkimage { + args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x100000";
+ blob { + filename = "u-boot-nodtb.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>;
+ 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 = <0x80000000>; + entry = <0x80000000>;
+ atf_blob: blob-ext { + filename = "bl31.bin"; + }; + };
+ fdt { + description = "imx8qm-rom7720-a1";
You can use "NAME" here I suppose.
I guess, Andrey meant filename, right?
Anyway, you may want to look at the latest clean-up I did here [2] et al. Otherwise I will have to go through that same clean-up for imx8qm later yet again :-p.
+ type = "flat_dt"; + compression = "none";
+ uboot_fdt_blob: blob-ext { + filename = "u-boot.dtb"; + }; + }; + };
+ configurations { + default = "conf";
+ conf { + description = "imx8qm-rom7720-a1";
And as well here, "NAME".
+ firmware = "uboot"; + loadables = "atf"; + fdt = "fdt"; + }; + }; + }; + }; +};
This binman configuration suggests that there are 2 binaries that should be populated onto the bootable media: flash.bin and u-boot.itb. Can you please convert them to use a single binary? Sample code for this is also in [1].
I also could not really find such information as at least the address where to put the second part will be crucial.
diff --git a/arch/arm/mach-imx/imx8/Kconfig b/arch/arm/mach-imx/imx8/Kconfig index b43739e5c6..b42b985cdf 100644 --- a/arch/arm/mach-imx/imx8/Kconfig +++ b/arch/arm/mach-imx/imx8/Kconfig @@ -81,6 +81,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 diff --git a/board/advantech/imx8qm_rom7720_a1/imximage.cfg b/board/advantech/imx8qm_rom7720_a1/imximage.cfg index e324c7ca37..30556ff9d7 100644 --- a/board/advantech/imx8qm_rom7720_a1/imximage.cfg +++ b/board/advantech/imx8qm_rom7720_a1/imximage.cfg @@ -5,17 +5,5 @@
#define __ASSEMBLY__
-/* Boot from SD, sector size 0x400 */ -BOOT_FROM SD 0x400 -/* SoC type IMX8QM */ -SOC_TYPE IMX8QM -/* Append seco container image */ -APPEND mx8qm-ahab-container.img -/* Create the 2nd container */ -CONTAINER -/* Add scfw image with exec attribute */ -IMAGE SCU mx8qm-val-scfw-tcm.bin -/* Add ATF image with exec attribute */ -IMAGE A35 bl31.bin 0x80000000 -/* Add U-Boot image with load attribute */ -DATA A35 u-boot-dtb.bin 0x80020000 +BOOT_FROM sd +LOADER u-boot-dtb.bin 0x10000 diff --git a/configs/imx8qm_rom7720_a1_4G_defconfig b/configs/imx8qm_rom7720_a1_4G_defconfig index fb43fa1962..07ea6e191d 100644 --- a/configs/imx8qm_rom7720_a1_4G_defconfig +++ b/configs/imx8qm_rom7720_a1_4G_defconfig @@ -18,7 +18,7 @@ CONFIG_SPL=y CONFIG_SYS_LOAD_ADDR=0x80280000 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y -CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" +# CONFIG_SPL_FIT_GENERATOR is not set
I guess, that would likely rather need to be as follows:
# CONFIG_USE_SPL_FIT_GENERATOR is not set
CONFIG_BOOTDELAY=3 CONFIG_LOG=y CONFIG_BOARD_EARLY_INIT_F=y -- 2.17.1
-- andrey
Link: [1]: https://lore.kernel.org/u-boot/20211203161802.12699-1-andrey.zhizhikin@leica...
[1] https://source.denx.de/u-boot/u-boot/-/commit/68de913c12c4d091f51009ad6f179f... [2] https://source.denx.de/u-boot/u-boot/-/commit/f17fb6cae4ddaa539f2a49851b112f...
Cheers
Marcel
On Mon, Jan 10, 2022 at 9:34 AM Marcel Ziswiler marcel.ziswiler@toradex.com wrote:
Hi Oliver
On Mon, 2022-01-10 at 14:29 +0000, ZHIZHIKIN Andrey wrote:
Hello Oliver,
-----Original Message----- From: Oliver Graute oliver.graute@kococonnector.com Sent: Monday, January 10, 2022 11:31 AM To: Oliver Graute oliver.graute@kococonnector.com; Stefano Babic sbabic@denx.de; Fabio Estevam festevam@gmail.com; NXP i.MX U-Boot
Team
uboot-imx@nxp.com Cc: aford173@gmail.com; peng.fan@nxp.com; marcel.ziswiler@toradex.com; tharvey@gateworks.com; ZHIZHIKIN Andrey <
andrey.zhizhikin@leica-geosystems.com>;
u-boot@lists.denx.de Subject: [RFC] imx: imx8qm-rom7720: switch to binman
Switch to use binman to pack images
Please don't forget S-o-B, checkpatch does complain about it. ;)
Run into this issue on the first try to get binman working:
make[1]: Nothing to be done for 'SPL'.
You may need something similar to [1]
BINMAN flash.bin MKIMAGE flash.bin Error: spl/u-boot-spl.cfgout[16] - Invalid command (LOADER) arch/arm/mach-imx/Makefile:190: recipe for target 'flash.bin' failed make[1]: *** [flash.bin] Error 1 make[1]: *** Deleting file 'flash.bin' Makefile:1519: recipe for target 'flash.bin' failed make: *** [flash.bin] Error 2
Some clue howto fix that?
This might be due to the fact that you're using the same
u-boot-nodtb.bin binary twice: once in binman
section, and once in ITB. You can try to rename the binman entry to a
different name, this might do the
trick. See [1] for sample of imx8mq_evk conversion.
Yep, adding the imx-boot/flash.bin binman section combining them two should avoid this.
To be honest, even on imx8mm it currently fails if doing make flash.bin rather than just make which will call BINMAN ALL. I guess, that might be some kind of a remnant resp. clash with before binman stuff.
⬢[zim@toolbox u-boot.git]$ make verdin-imx8mm_defconfig ⬢[zim@toolbox u-boot.git]$ make -j12 flash.bin ... BINMAN flash.bin MKIMAGE flash.bin ./tools/mkimage: Can't open spl/u-boot-spl-ddr.bin: No such file or directory
When I got this error, I had to double check the imximage-8mm-lpddr4.cfg file referenced from the Kconfig. Beacon has a custom one [1] that doesn't point to spl, and that made this error go away.
[1] https://source.denx.de/u-boot/u-boot/-/blob/master/board/beacon/imx8mm/imxim...
make[1]: *** [arch/arm/mach-imx/Makefile:167: flash.bin] Error 1 make[1]: *** Deleting file 'flash.bin' make: *** [Makefile:1521: flash.bin] Error 2
arch/arm/dts/imx8qm-rom7720-a1.dts | 1 + arch/arm/dts/imx8qm-u-boot.dtsi | 95 +++++++++++++++++++ arch/arm/mach-imx/imx8/Kconfig | 1 + .../advantech/imx8qm_rom7720_a1/imximage.cfg | 16 +--- configs/imx8qm_rom7720_a1_4G_defconfig | 2 +-
Is there any documentation available for this board that needs adaptions with new build instructions? I was not able to locate any doc for this board at all...
5 files changed, 100 insertions(+), 15 deletions(-) create mode 100644 arch/arm/dts/imx8qm-u-boot.dtsi
diff --git a/arch/arm/dts/imx8qm-rom7720-a1.dts
b/arch/arm/dts/imx8qm-rom7720-
a1.dts index d1f2fff869..332d441c6d 100644 --- a/arch/arm/dts/imx8qm-rom7720-a1.dts +++ b/arch/arm/dts/imx8qm-rom7720-a1.dts @@ -10,6 +10,7 @@ /memreserve/ 0x80000000 0x00020000;
#include "fsl-imx8qm.dtsi" +#include "imx8qm-u-boot.dtsi"
/ { model = "Advantech iMX8QM Qseven series"; diff --git a/arch/arm/dts/imx8qm-u-boot.dtsi
b/arch/arm/dts/imx8qm-u-boot.dtsi
new file mode 100644 index 0000000000..77e5cd6989 --- /dev/null +++ b/arch/arm/dts/imx8qm-u-boot.dtsi @@ -0,0 +1,95 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*
- Copyright 2021 NXP
- */
+/ {
binman: binman {multiple-images;};Please avoid such empty lines before closing curly braces.
+};
+&binman {
u-boot-nodtb {filename = "u-boot-nodtb.bin";pad-byte = <0xff>;align-size = <4>;align = <4>;u-boot-spl {align-end = <4>;};What I see is missing in this section is SECO and SCFW binaries.
Can i.MX8QM boot without those? Otherwise generated image will be
unusable.
};flash {mkimage {args = "-n spl/u-boot-spl.cfgout -T imx8mimage-e
0x100000";
blob {filename = "u-boot-nodtb.bin";};};};itb {filename = "u-boot.itb";fit {description = "Configuration to load ATFbefore U-Boot";
#address-cells = <1>;fit,external-offset =<CONFIG_FIT_EXTERNAL_OFFSET>;
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 TrustedFirmware";
type = "firmware";arch = "arm64";compression = "none";load = <0x80000000>;entry = <0x80000000>;atf_blob: blob-ext {filename = "bl31.bin";};};fdt {description ="imx8qm-rom7720-a1";
You can use "NAME" here I suppose.
I guess, Andrey meant filename, right?
Anyway, you may want to look at the latest clean-up I did here [2] et al. Otherwise I will have to go through that same clean-up for imx8qm later yet again :-p.
type = "flat_dt";compression = "none";uboot_fdt_blob: blob-ext {filename ="u-boot.dtb";
};};};configurations {default = "conf";conf {description ="imx8qm-rom7720-a1";
And as well here, "NAME".
firmware = "uboot";loadables = "atf";fdt = "fdt";};};};};+};
This binman configuration suggests that there are 2 binaries that should be populated onto the bootable media: flash.bin and u-boot.itb. Can you please convert them to use a single binary? Sample code for this is also in [1].
I also could not really find such information as at least the address where to put the second part will be crucial.
diff --git a/arch/arm/mach-imx/imx8/Kconfig
b/arch/arm/mach-imx/imx8/Kconfig
index b43739e5c6..b42b985cdf 100644 --- a/arch/arm/mach-imx/imx8/Kconfig +++ b/arch/arm/mach-imx/imx8/Kconfig @@ -81,6 +81,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 IMX8QMdiff --git a/board/advantech/imx8qm_rom7720_a1/imximage.cfg b/board/advantech/imx8qm_rom7720_a1/imximage.cfg index e324c7ca37..30556ff9d7 100644 --- a/board/advantech/imx8qm_rom7720_a1/imximage.cfg +++ b/board/advantech/imx8qm_rom7720_a1/imximage.cfg @@ -5,17 +5,5 @@
#define __ASSEMBLY__
-/* Boot from SD, sector size 0x400 */ -BOOT_FROM SD 0x400 -/* SoC type IMX8QM */ -SOC_TYPE IMX8QM -/* Append seco container image */ -APPEND mx8qm-ahab-container.img -/* Create the 2nd container */ -CONTAINER -/* Add scfw image with exec attribute */ -IMAGE SCU mx8qm-val-scfw-tcm.bin -/* Add ATF image with exec attribute */ -IMAGE A35 bl31.bin 0x80000000 -/* Add U-Boot image with load attribute */ -DATA A35 u-boot-dtb.bin 0x80020000 +BOOT_FROM sd +LOADER u-boot-dtb.bin 0x10000 diff --git a/configs/imx8qm_rom7720_a1_4G_defconfig b/configs/imx8qm_rom7720_a1_4G_defconfig index fb43fa1962..07ea6e191d 100644 --- a/configs/imx8qm_rom7720_a1_4G_defconfig +++ b/configs/imx8qm_rom7720_a1_4G_defconfig @@ -18,7 +18,7 @@ CONFIG_SPL=y CONFIG_SYS_LOAD_ADDR=0x80280000 CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y -CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" +# CONFIG_SPL_FIT_GENERATOR is not set
I guess, that would likely rather need to be as follows:
# CONFIG_USE_SPL_FIT_GENERATOR is not set
CONFIG_BOOTDELAY=3 CONFIG_LOG=y CONFIG_BOARD_EARLY_INIT_F=y -- 2.17.1
-- andrey
Link: [1]:
https://lore.kernel.org/u-boot/20211203161802.12699-1-andrey.zhizhikin@leica...
[1] https://source.denx.de/u-boot/u-boot/-/commit/68de913c12c4d091f51009ad6f179f... [2] https://source.denx.de/u-boot/u-boot/-/commit/f17fb6cae4ddaa539f2a49851b112f...
Cheers
Marcel
Switch to use binman to pack images
Signed-off-by: Oliver Graute oliver.graute@kococonnector.com ---
A flash.bin is now generated by binman but its now bigger then with mkimage_fit_atf.sh 800K vs. 1.1M and is currently NOT booting. So something is still messed up.
arch/arm/dts/imx8qm-rom7720-a1.dts | 1 + arch/arm/dts/imx8qm-u-boot.dtsi | 136 ++++++++++++++++++ arch/arm/mach-imx/imx8/Kconfig | 1 + .../advantech/imx8qm_rom7720_a1/imximage.cfg | 16 +-- configs/imx8qm_rom7720_a1_4G_defconfig | 2 +- doc/board/advantech/imx8qm-rom7720-a1.rst | 3 +- 6 files changed, 142 insertions(+), 17 deletions(-) create mode 100644 arch/arm/dts/imx8qm-u-boot.dtsi
diff --git a/arch/arm/dts/imx8qm-rom7720-a1.dts b/arch/arm/dts/imx8qm-rom7720-a1.dts index d1f2fff869..332d441c6d 100644 --- a/arch/arm/dts/imx8qm-rom7720-a1.dts +++ b/arch/arm/dts/imx8qm-rom7720-a1.dts @@ -10,6 +10,7 @@ /memreserve/ 0x80000000 0x00020000;
#include "fsl-imx8qm.dtsi" +#include "imx8qm-u-boot.dtsi"
/ { model = "Advantech iMX8QM Qseven series"; diff --git a/arch/arm/dts/imx8qm-u-boot.dtsi b/arch/arm/dts/imx8qm-u-boot.dtsi new file mode 100644 index 0000000000..98379516cc --- /dev/null +++ b/arch/arm/dts/imx8qm-u-boot.dtsi @@ -0,0 +1,136 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2021 NXP + */ + +/ { + binman: binman { + multiple-images; + }; +}; + +&binman { + u-boot { + align-size = <4>; + align = <4>; + filename = "u-boot.bin"; + pad-byte = <0xff>; + + u-boot-spl { + align-end = <4>; + }; + }; + + spl { + filename = "spl.bin"; + mkimage { + args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x100000"; + + blob { + filename = "u-boot.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>; + + 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 = "blob-ext"; + }; + }; + + scfw { + arch = "arm64"; + compression = "none"; + description = "System Controler Firmware"; + type = "firmware"; + + scfw_blob { + filename = "mx8qm-val-scfw-tcm.bin"; + type = "blob-ext"; + }; + }; + + seco { + arch = "arm64"; + compression = "none"; + description = "Seco Firmware"; + type = "firmware"; + + seco_blob { + filename = "mx8qm-ahab-container.img"; + type = "blob-ext"; + }; + }; + + fdt { + filename = "imx8qm-rom7720-a1"; + type = "flat_dt"; + compression = "none"; + + uboot_fdt_blob { + filename = "u-boot.dtb"; + type = "blob-ext"; + }; + }; + }; + + configurations { + default = "conf"; + + conf { + filename = "imx8qm-rom7720-a1"; + firmware = "uboot"; + loadables = "atf"; + fdt = "fdt"; + }; + }; + }; + }; + + imx-boot { + filename = "flash.bin"; + pad-byte = <0x00>; + + spl { + filename = "spl.bin"; + offset = <0x0>; + type = "blob-ext"; + }; + + binman_uboot: uboot { + filename = "u-boot.itb"; + offset = <0x6e400>; + type = "blob-ext"; + }; + }; +}; diff --git a/arch/arm/mach-imx/imx8/Kconfig b/arch/arm/mach-imx/imx8/Kconfig index b43739e5c6..b42b985cdf 100644 --- a/arch/arm/mach-imx/imx8/Kconfig +++ b/arch/arm/mach-imx/imx8/Kconfig @@ -81,6 +81,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 diff --git a/board/advantech/imx8qm_rom7720_a1/imximage.cfg b/board/advantech/imx8qm_rom7720_a1/imximage.cfg index e324c7ca37..30556ff9d7 100644 --- a/board/advantech/imx8qm_rom7720_a1/imximage.cfg +++ b/board/advantech/imx8qm_rom7720_a1/imximage.cfg @@ -5,17 +5,5 @@
#define __ASSEMBLY__
-/* Boot from SD, sector size 0x400 */ -BOOT_FROM SD 0x400 -/* SoC type IMX8QM */ -SOC_TYPE IMX8QM -/* Append seco container image */ -APPEND mx8qm-ahab-container.img -/* Create the 2nd container */ -CONTAINER -/* Add scfw image with exec attribute */ -IMAGE SCU mx8qm-val-scfw-tcm.bin -/* Add ATF image with exec attribute */ -IMAGE A35 bl31.bin 0x80000000 -/* Add U-Boot image with load attribute */ -DATA A35 u-boot-dtb.bin 0x80020000 +BOOT_FROM sd +LOADER u-boot-dtb.bin 0x10000 diff --git a/configs/imx8qm_rom7720_a1_4G_defconfig b/configs/imx8qm_rom7720_a1_4G_defconfig index fb43fa1962..26afa4f8d7 100644 --- a/configs/imx8qm_rom7720_a1_4G_defconfig +++ b/configs/imx8qm_rom7720_a1_4G_defconfig @@ -18,7 +18,7 @@ CONFIG_SPL=y CONFIG_SYS_LOAD_ADDR=0x80280000 CONFIG_FIT=y 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_LOG=y CONFIG_BOARD_EARLY_INIT_F=y diff --git a/doc/board/advantech/imx8qm-rom7720-a1.rst b/doc/board/advantech/imx8qm-rom7720-a1.rst index bd4be1dbeb..953cf01fde 100644 --- a/doc/board/advantech/imx8qm-rom7720-a1.rst +++ b/doc/board/advantech/imx8qm-rom7720-a1.rst @@ -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 ---------------------------------
On 12/01/22, Oliver Graute wrote:
Switch to use binman to pack images
Signed-off-by: Oliver Graute oliver.graute@kococonnector.com
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 = "blob-ext";};};scfw {arch = "arm64";compression = "none";description = "System Controler Firmware";type = "firmware";scfw_blob {filename = "mx8qm-val-scfw-tcm.bin";type = "blob-ext";};};seco {arch = "arm64";compression = "none";description = "Seco Firmware";type = "firmware";seco_blob {filename = "mx8qm-ahab-container.img";type = "blob-ext";};};fdt {filename = "imx8qm-rom7720-a1";type = "flat_dt";compression = "none";uboot_fdt_blob {filename = "u-boot.dtb";type = "blob-ext";};};};
As far as I now the order of the blobs for imx8qm is:
1.SECO 2.scfw 3.ATF 4.U-Boot
So do I need to reorder the blobs nodes above? How is the order determined?
#define __ASSEMBLY__
-/* Boot from SD, sector size 0x400 */ -BOOT_FROM SD 0x400 -/* SoC type IMX8QM */ -SOC_TYPE IMX8QM -/* Append seco container image */ -APPEND mx8qm-ahab-container.img -/* Create the 2nd container */ -CONTAINER -/* Add scfw image with exec attribute */ -IMAGE SCU mx8qm-val-scfw-tcm.bin -/* Add ATF image with exec attribute */ -IMAGE A35 bl31.bin 0x80000000 -/* Add U-Boot image with load attribute */ -DATA A35 u-boot-dtb.bin 0x80020000
this is what imx-image is doing before. Can someone comment on this?
Best Regards,
Oliver
On 12/01/22, Oliver Graute wrote:
Switch to use binman to pack images
Signed-off-by: Oliver Graute oliver.graute@kococonnector.com
A flash.bin is now generated by binman but its now bigger then with mkimage_fit_atf.sh 800K vs. 1.1M and is currently NOT booting. So something is still messed up.
arch/arm/dts/imx8qm-rom7720-a1.dts | 1 + arch/arm/dts/imx8qm-u-boot.dtsi | 136 ++++++++++++++++++ arch/arm/mach-imx/imx8/Kconfig | 1 + .../advantech/imx8qm_rom7720_a1/imximage.cfg | 16 +-- configs/imx8qm_rom7720_a1_4G_defconfig | 2 +- doc/board/advantech/imx8qm-rom7720-a1.rst | 3 +- 6 files changed, 142 insertions(+), 17 deletions(-) create mode 100644 arch/arm/dts/imx8qm-u-boot.dtsi
diff --git a/arch/arm/dts/imx8qm-rom7720-a1.dts b/arch/arm/dts/imx8qm-rom7720-a1.dts index d1f2fff869..332d441c6d 100644 --- a/arch/arm/dts/imx8qm-rom7720-a1.dts +++ b/arch/arm/dts/imx8qm-rom7720-a1.dts @@ -10,6 +10,7 @@ /memreserve/ 0x80000000 0x00020000;
#include "fsl-imx8qm.dtsi" +#include "imx8qm-u-boot.dtsi"
/ { model = "Advantech iMX8QM Qseven series"; diff --git a/arch/arm/dts/imx8qm-u-boot.dtsi b/arch/arm/dts/imx8qm-u-boot.dtsi new file mode 100644 index 0000000000..98379516cc --- /dev/null +++ b/arch/arm/dts/imx8qm-u-boot.dtsi @@ -0,0 +1,136 @@ +// SPDX-License-Identifier: GPL-2.0+ +/*
- Copyright 2021 NXP
- */
+/ {
- binman: binman {
multiple-images;- };
+};
+&binman {
- u-boot {
align-size = <4>;align = <4>;filename = "u-boot.bin";pad-byte = <0xff>;u-boot-spl {align-end = <4>;};- };
- spl {
filename = "spl.bin";mkimage {args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x100000";
this refers to the wrong container format for imx8qm! So replacing s/imx8mimage/imx8image/ does help to get a working image.
#define __ASSEMBLY__
-/* Boot from SD, sector size 0x400 */ -BOOT_FROM SD 0x400 -/* SoC type IMX8QM */ -SOC_TYPE IMX8QM -/* Append seco container image */ -APPEND mx8qm-ahab-container.img -/* Create the 2nd container */ -CONTAINER -/* Add scfw image with exec attribute */ -IMAGE SCU mx8qm-val-scfw-tcm.bin -/* Add ATF image with exec attribute */ -IMAGE A35 bl31.bin 0x80000000 -/* Add U-Boot image with load attribute */ -DATA A35 u-boot-dtb.bin 0x80020000
I need to keep this here to.
+BOOT_FROM sd +LOADER u-boot-dtb.bin 0x10000
with this changes the resulting flash.bin is as big as before and its booting flawlessly.
I 'll ppst later a patch v1 for this.
Best regards,
Oliver
participants (5)
-
Adam Ford -
Marcel Ziswiler -
Oliver Graute -
Oliver Graute -
ZHIZHIKIN Andrey