* [PATCH v3] imx: imx8qm-rom7720: switch to binman
@ 2022-10-07 13:09 Oliver Graute
2022-10-25 14:04 ` Fabio Estevam
0 siblings, 1 reply; 3+ messages in thread
From: Oliver Graute @ 2022-10-07 13:09 UTC (permalink / raw)
To: trini
Cc: sbabic, festevam, uboot-imx, peng.fan, oliver.graute,
oliver.graute, u-boot, Marcel Ziswiler, Ye Li, Gaurav Jain,
Denys Drozdov, Horia Geantă
Switch to use binman to pack images
Signed-off-by: Oliver Graute <oliver.graute@kococonnector.com>
---
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 | 2 +-
doc/board/advantech/imx8qm-rom7720-a1.rst | 3 +-
6 files changed, 139 insertions(+), 5 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..5da420ece6
--- /dev/null
+++ b/arch/arm/dts/imx8qm-u-boot.dtsi
@@ -0,0 +1,133 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 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 = "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";
+ fdt = "fdt";
+ firmware = "uboot";
+ loadables = "atf";
+ };
+ };
+ };
+ };
+
+ imx-boot {
+ filename = "flash.bin";
+ pad-byte = <0x00>;
+
+ spl {
+ filename = "spl.bin";
+ offset = <0x0>;
+ type = "blob-ext";
+ };
+ };
+};
diff --git a/arch/arm/mach-imx/imx8/Kconfig b/arch/arm/mach-imx/imx8/Kconfig
index abb03340d8..71abbb33ea 100644
--- a/arch/arm/mach-imx/imx8/Kconfig
+++ b/arch/arm/mach-imx/imx8/Kconfig
@@ -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
diff --git a/board/advantech/imx8qm_rom7720_a1/imximage.cfg b/board/advantech/imx8qm_rom7720_a1/imximage.cfg
index 5ecde0c530..43035088e3 100644
--- a/board/advantech/imx8qm_rom7720_a1/imximage.cfg
+++ b/board/advantech/imx8qm_rom7720_a1/imximage.cfg
@@ -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 */
diff --git a/configs/imx8qm_rom7720_a1_4G_defconfig b/configs/imx8qm_rom7720_a1_4G_defconfig
index 3b099761a9..ed79cb732f 100644
--- a/configs/imx8qm_rom7720_a1_4G_defconfig
+++ b/configs/imx8qm_rom7720_a1_4G_defconfig
@@ -21,7 +21,7 @@ CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000
CONFIG_REMAKE_ELF=y
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_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"
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
---------------------------------
--
2.17.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3] imx: imx8qm-rom7720: switch to binman
2022-10-07 13:09 [PATCH v3] imx: imx8qm-rom7720: switch to binman Oliver Graute
@ 2022-10-25 14:04 ` Fabio Estevam
2022-10-25 14:26 ` Oliver Graute
0 siblings, 1 reply; 3+ messages in thread
From: Fabio Estevam @ 2022-10-25 14:04 UTC (permalink / raw)
To: Oliver Graute
Cc: trini, sbabic, uboot-imx, peng.fan, oliver.graute, u-boot,
Marcel Ziswiler, Ye Li, Gaurav Jain, Denys Drozdov,
Horia Geantă
Hi Oliver,
On Fri, Oct 7, 2022 at 10:14 AM Oliver Graute
<oliver.graute@kococonnector.com> wrote:
> + fdt {
> + filename = "imx8qm-rom7720-a1";
Please do not hardcode this dtb filename inside the common
imx8qm-u-boot.dtsi file.
You can look at arch/arm/dts/imx8mm-u-boot.dtsi as a reference.
> + type = "flat_dt";
> + compression = "none";
> +
> + uboot_fdt_blob {
> + filename = "u-boot.dtb";
> + type = "blob-ext";
> + };
> + };
> + };
> +
> + configurations {
> + default = "conf";
> +
> + conf {
> + filename = "imx8qm-rom7720-a1";
Same here.
Also, could you please try converting all imx8mq/qxp boards to binman?
Thanks
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3] imx: imx8qm-rom7720: switch to binman
2022-10-25 14:04 ` Fabio Estevam
@ 2022-10-25 14:26 ` Oliver Graute
0 siblings, 0 replies; 3+ messages in thread
From: Oliver Graute @ 2022-10-25 14:26 UTC (permalink / raw)
To: Fabio Estevam
Cc: trini, sbabic, uboot-imx, peng.fan, u-boot, Marcel Ziswiler,
Ye Li, Gaurav Jain, Denys Drozdov, Horia Geantă
On 25/10/22, Fabio Estevam wrote:
> Hi Oliver,
>
> On Fri, Oct 7, 2022 at 10:14 AM Oliver Graute
> <oliver.graute@kococonnector.com> wrote:
>
> > + fdt {
> > + filename = "imx8qm-rom7720-a1";
>
> Please do not hardcode this dtb filename inside the common
> imx8qm-u-boot.dtsi file.
OK I'll remove the line
>
> You can look at arch/arm/dts/imx8mm-u-boot.dtsi as a reference.
OK
>
> > + type = "flat_dt";
> > + compression = "none";
> > +
> > + uboot_fdt_blob {
> > + filename = "u-boot.dtb";
> > + type = "blob-ext";
> > + };
> > + };
> > + };
> > +
> > + configurations {
> > + default = "conf";
> > +
> > + conf {
> > + filename = "imx8qm-rom7720-a1";
>
> Same here.
Ok
>
> Also, could you please try converting all imx8mq/qxp boards to binman?
ok I'll try this.
> Thanks
Best regards,
Oliver
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-25 14:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-07 13:09 [PATCH v3] imx: imx8qm-rom7720: switch to binman Oliver Graute
2022-10-25 14:04 ` Fabio Estevam
2022-10-25 14:26 ` Oliver Graute
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.