* [PATCH V2 1/7] arm: dts: imx8mn-u-boot: Create common imx8mn-u-boot.dtsi
2022-10-22 0:58 [PATCH V2 0/7] arm: dts: Create common imx8mn-u-boot Adam Ford
@ 2022-10-22 0:58 ` Adam Ford
2022-10-24 13:56 ` sbabic
2022-10-22 0:58 ` [PATCH V2 2/7] arm: dts: imx8mn-beacon-kit: Consolidate with imx8mn-u-boot Adam Ford
` (5 subsequent siblings)
6 siblings, 1 reply; 15+ messages in thread
From: Adam Ford @ 2022-10-22 0:58 UTC (permalink / raw)
To: u-boot
Cc: Adam Ford, Fabio Estevam, Stefano Babic, Fabio Estevam,
NXP i.MX U-Boot Team, Ariel D'Alessandro, Michael Trimarchi,
Tim Harvey
Multiple boards create duplicate entries in their respective
-u-boot.dtsi files which all basically do the same thing.
To consolidate these and make it easier to make improvements
going forward, consolidate them all into one place.
This file creates a flash.bin image using binman, and supports
LPDDR4, DDR4 and DDR3. Since individual boards use different
peripherals and different UART ports, those entries were kept
in their respective board files, but the spba1 node was addded
which contains all UART1-3 to help facilitate SPL_DM_SERIAL.
Individual users will still need to include their respective
UART and pinctrl nodes for those UARTS.
This consolidated file also supports generating a flash.bin file
which can boot from flexSPI if CONFIG_FSPI_CONF_HEADER is
enabled.
Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Fabio Estevam <festevam@denx.de>
diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi
new file mode 100644
index 0000000000..327d4070fc
--- /dev/null
+++ b/arch/arm/dts/imx8mn-u-boot.dtsi
@@ -0,0 +1,248 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2022 Logic PD, Inc dba Beacon EmbeddedWorks
+ */
+
+/ {
+ binman: binman {
+ multiple-images;
+ };
+
+ firmware {
+ optee {
+ compatible = "linaro,optee-tz";
+ method = "smc";
+ };
+ };
+
+ wdt-reboot {
+ compatible = "wdt-reboot";
+ wdt = <&wdog1>;
+ u-boot,dm-spl;
+ };
+};
+
+&{/soc@0} {
+ u-boot,dm-pre-reloc;
+ u-boot,dm-spl;
+};
+
+&aips1 {
+ u-boot,dm-spl;
+ u-boot,dm-pre-reloc;
+};
+
+&aips2 {
+ u-boot,dm-spl;
+};
+
+&aips3 {
+ u-boot,dm-spl;
+};
+
+&aips4 {
+ u-boot,dm-spl;
+};
+
+&clk {
+ u-boot,dm-spl;
+ u-boot,dm-pre-reloc;
+ /delete-property/ assigned-clocks;
+ /delete-property/ assigned-clock-parents;
+ /delete-property/ assigned-clock-rates;
+};
+
+&iomuxc {
+ u-boot,dm-spl;
+};
+
+&osc_24m {
+ u-boot,dm-spl;
+ u-boot,dm-pre-reloc;
+};
+
+&spba1 {
+ u-boot,dm-spl;
+};
+
+&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>;
+ filename = "u-boot-spl.bin";
+ };
+
+ ddr-1d-imem-fw {
+#ifdef CONFIG_IMX8M_LPDDR4
+ filename = "lpddr4_pmu_train_1d_imem.bin";
+#elif CONFIG_IMX8M_DDR4
+ filename = "ddr4_imem_1d.bin";
+#else
+ filename = "ddr3_imem_1d.bin";
+#endif
+ type = "blob-ext";
+ align-end = <4>;
+ };
+
+ ddr-1d-dmem-fw {
+#ifdef CONFIG_IMX8M_LPDDR4
+ filename = "lpddr4_pmu_train_1d_dmem.bin";
+#elif CONFIG_IMX8M_DDR4
+ filename = "ddr4_dmem_1d.bin";
+#else
+ filename = "ddr3_dmem_1d.bin";
+#endif
+ type = "blob-ext";
+ align-end = <4>;
+ };
+
+ ddr-2d-imem-fw {
+#ifdef CONFIG_IMX8M_LPDDR4
+ filename = "lpddr4_pmu_train_2d_imem.bin";
+#elif CONFIG_IMX8M_DDR4
+ filename = "ddr4_imem_2d.bin";
+#endif
+ type = "blob-ext";
+ align-end = <4>;
+ };
+
+ ddr-2d-dmem-fw {
+#ifdef CONFIG_IMX8M_LPDDR4
+ filename = "lpddr4_pmu_train_2d_dmem.bin";
+#elif CONFIG_IMX8M_DDR4
+ filename = "ddr4_dmem_2d.bin";
+#endif
+ type = "blob-ext";
+ align-end = <4>;
+ };
+ };
+
+ spl {
+ filename = "spl.bin";
+
+ mkimage {
+ args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
+
+ 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 = <0x960000>;
+ load = <0x960000>;
+ type = "firmware";
+
+ atf-blob {
+ filename = "bl31.bin";
+ type = "atf-bl31";
+ };
+ };
+
+ binman_fip: fip {
+ arch = "arm64";
+ compression = "none";
+ description = "Trusted Firmware FIP";
+ load = <0x40310000>;
+ type = "firmware";
+ };
+
+ @fdt-SEQ {
+ compression = "none";
+ description = "NAME";
+ type = "flat_dt";
+
+ uboot-fdt-blob {
+ filename = "u-boot.dtb";
+ type = "blob-ext";
+ };
+ };
+ };
+
+ configurations {
+ default = "@config-DEFAULT-SEQ";
+
+ binman_configuration: @config-SEQ {
+ description = "NAME";
+ fdt = "fdt-SEQ";
+ firmware = "uboot";
+ loadables = "atf";
+ };
+ };
+ };
+ };
+
+ imx-boot {
+ filename = "flash.bin";
+ pad-byte = <0x00>;
+
+#ifdef CONFIG_FSPI_CONF_HEADER
+ fspi_conf_block {
+ filename = CONFIG_FSPI_CONF_FILE;
+ type = "blob-ext";
+ offset = <0x400>;
+ };
+
+ spl {
+ filename = "spl.bin";
+ offset = <0x1000>;
+ type = "blob-ext";
+ };
+
+ binman_uboot: uboot {
+ filename = "u-boot.itb";
+ offset = <0x59000>;
+ type = "blob-ext";
+ };
+#else
+
+ spl {
+ offset = <0x0>;
+ filename = "spl.bin";
+ type = "blob-ext";
+ };
+
+ binman_uboot: uboot {
+ offset = <0x58000>;
+ filename = "u-boot.itb";
+ type = "blob-ext";
+ };
+#endif
+ };
+};
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH V2 1/7] arm: dts: imx8mn-u-boot: Create common imx8mn-u-boot.dtsi
2022-10-22 0:58 ` [PATCH V2 1/7] arm: dts: imx8mn-u-boot: Create common imx8mn-u-boot.dtsi Adam Ford
@ 2022-10-24 13:56 ` sbabic
0 siblings, 0 replies; 15+ messages in thread
From: sbabic @ 2022-10-24 13:56 UTC (permalink / raw)
To: Adam Ford, u-boot
> Multiple boards create duplicate entries in their respective
> -u-boot.dtsi files which all basically do the same thing.
> To consolidate these and make it easier to make improvements
> going forward, consolidate them all into one place.
> This file creates a flash.bin image using binman, and supports
> LPDDR4, DDR4 and DDR3. Since individual boards use different
> peripherals and different UART ports, those entries were kept
> in their respective board files, but the spba1 node was addded
> which contains all UART1-3 to help facilitate SPL_DM_SERIAL.
> Individual users will still need to include their respective
> UART and pinctrl nodes for those UARTS.
> This consolidated file also supports generating a flash.bin file
> which can boot from flexSPI if CONFIG_FSPI_CONF_HEADER is
> enabled.
> Signed-off-by: Adam Ford <aford173@gmail.com>
> Reviewed-by: Fabio Estevam <festevam@denx.de>
> diff --git a/arch/arm/dts/imx8mn-u-boot.dtsi b/arch/arm/dts/imx8mn-u-boot.dtsi
> new file mode 100644
> index 0000000000..327d4070fc
> --- /dev/null
> +++ b/arch/arm/dts/imx8mn-u-boot.dtsi
> @@ -0,0 +1,248 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/*
> + * Copyright 2022 Logic PD, Inc dba Beacon EmbeddedWorks
> + */
> +
> +/ {
> + binman: binman {
> + multiple-images;
> + };
> +
> + firmware {
> + optee {
> + compatible = "linaro,optee-tz";
> + method = "smc";
> + };
> + };
> +
> + wdt-reboot {
> + compatible = "wdt-reboot";
> + wdt = <&wdog1>;
> + u-boot,dm-spl;
> + };
> +};
> +
> +&{/soc@0} {
> + u-boot,dm-pre-reloc;
> + u-boot,dm-spl;
> +};
> +
> +&aips1 {
> + u-boot,dm-spl;
> + u-boot,dm-pre-reloc;
> +};
> +
> +&aips2 {
> + u-boot,dm-spl;
> +};
> +
> +&aips3 {
> + u-boot,dm-spl;
> +};
> +
> +&aips4 {
> + u-boot,dm-spl;
> +};
> +
> +&clk {
> + u-boot,dm-spl;
> + u-boot,dm-pre-reloc;
> + /delete-property/ assigned-clocks;
> + /delete-property/ assigned-clock-parents;
> + /delete-property/ assigned-clock-rates;
> +};
> +
> +&iomuxc {
> + u-boot,dm-spl;
> +};
> +
> +&osc_24m {
> + u-boot,dm-spl;
> + u-boot,dm-pre-reloc;
> +};
> +
> +&spba1 {
> + u-boot,dm-spl;
> +};
> +
> +&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>;
> + filename = "u-boot-spl.bin";
> + };
> +
> + ddr-1d-imem-fw {
> +#ifdef CONFIG_IMX8M_LPDDR4
> + filename = "lpddr4_pmu_train_1d_imem.bin";
> +#elif CONFIG_IMX8M_DDR4
> + filename = "ddr4_imem_1d.bin";
> +#else
> + filename = "ddr3_imem_1d.bin";
> +#endif
> + type = "blob-ext";
> + align-end = <4>;
> + };
> +
> + ddr-1d-dmem-fw {
> +#ifdef CONFIG_IMX8M_LPDDR4
> + filename = "lpddr4_pmu_train_1d_dmem.bin";
> +#elif CONFIG_IMX8M_DDR4
> + filename = "ddr4_dmem_1d.bin";
> +#else
> + filename = "ddr3_dmem_1d.bin";
> +#endif
> + type = "blob-ext";
> + align-end = <4>;
> + };
> +
> + ddr-2d-imem-fw {
> +#ifdef CONFIG_IMX8M_LPDDR4
> + filename = "lpddr4_pmu_train_2d_imem.bin";
> +#elif CONFIG_IMX8M_DDR4
> + filename = "ddr4_imem_2d.bin";
> +#endif
> + type = "blob-ext";
> + align-end = <4>;
> + };
> +
> + ddr-2d-dmem-fw {
> +#ifdef CONFIG_IMX8M_LPDDR4
> + filename = "lpddr4_pmu_train_2d_dmem.bin";
> +#elif CONFIG_IMX8M_DDR4
> + filename = "ddr4_dmem_2d.bin";
> +#endif
> + type = "blob-ext";
> + align-end = <4>;
> + };
> + };
> +
> + spl {
> + filename = "spl.bin";
> +
> + mkimage {
> + args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
> +
> + 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 = <0x960000>;
> + load = <0x960000>;
> + type = "firmware";
> +
> + atf-blob {
> + filename = "bl31.bin";
> + type = "atf-bl31";
> + };
> + };
> +
> + binman_fip: fip {
> + arch = "arm64";
> + compression = "none";
> + description = "Trusted Firmware FIP";
> + load = <0x40310000>;
> + type = "firmware";
> + };
> +
> + @fdt-SEQ {
> + compression = "none";
> + description = "NAME";
> + type = "flat_dt";
> +
> + uboot-fdt-blob {
> + filename = "u-boot.dtb";
> + type = "blob-ext";
> + };
> + };
> + };
> +
> + configurations {
> + default = "@config-DEFAULT-SEQ";
> +
> + binman_configuration: @config-SEQ {
> + description = "NAME";
> + fdt = "fdt-SEQ";
> + firmware = "uboot";
> + loadables = "atf";
> + };
> + };
> + };
> + };
> +
> + imx-boot {
> + filename = "flash.bin";
> + pad-byte = <0x00>;
> +
> +#ifdef CONFIG_FSPI_CONF_HEADER
> + fspi_conf_block {
> + filename = CONFIG_FSPI_CONF_FILE;
> + type = "blob-ext";
> + offset = <0x400>;
> + };
> +
> + spl {
> + filename = "spl.bin";
> + offset = <0x1000>;
> + type = "blob-ext";
> + };
> +
> + binman_uboot: uboot {
> + filename = "u-boot.itb";
> + offset = <0x59000>;
> + type = "blob-ext";
> + };
> +#else
> +
> + spl {
> + offset = <0x0>;
> + filename = "spl.bin";
> + type = "blob-ext";
> + };
> +
> + binman_uboot: uboot {
> + offset = <0x58000>;
> + filename = "u-boot.itb";
> + type = "blob-ext";
> + };
> +#endif
> + };
> +};
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
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: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH V2 2/7] arm: dts: imx8mn-beacon-kit: Consolidate with imx8mn-u-boot
2022-10-22 0:58 [PATCH V2 0/7] arm: dts: Create common imx8mn-u-boot Adam Ford
2022-10-22 0:58 ` [PATCH V2 1/7] arm: dts: imx8mn-u-boot: Create common imx8mn-u-boot.dtsi Adam Ford
@ 2022-10-22 0:58 ` Adam Ford
2022-10-24 13:55 ` sbabic
2022-10-22 0:58 ` [PATCH V2 3/7] arm: dts: imx8mn-bsh-smm-s2: " Adam Ford
` (4 subsequent siblings)
6 siblings, 1 reply; 15+ messages in thread
From: Adam Ford @ 2022-10-22 0:58 UTC (permalink / raw)
To: u-boot
Cc: Adam Ford, Stefano Babic, Fabio Estevam, NXP i.MX U-Boot Team,
Ariel D'Alessandro, Michael Trimarchi, Tim Harvey
Now that a unified imx8mn-u-boot is available, remove duplicated
code for generating flash.bin and other common imx8mn peripherals.
Signed-off-by: Adam Ford <aford173@gmail.com>
diff --git a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
index 0efa6862eb..3180d57239 100644
--- a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
@@ -1,24 +1,9 @@
// SPDX-License-Identifier: GPL-2.0+
/*
- * Copyright 2020 Compass Electronics Group, LLC
+ * Copyright 2022 Logic PD, Inc. dba Beacon EmbeddedWorks
*/
-/ {
- binman: binman {
- multiple-images;
- };
-
- wdt-reboot {
- compatible = "wdt-reboot";
- wdt = <&wdog1>;
- u-boot,dm-spl;
- };
-};
-
-&{/soc@0} {
- u-boot,dm-pre-reloc;
- u-boot,dm-spl;
-};
+#include "imx8mn-u-boot.dtsi"
&{/soc@0/bus@30800000/i2c@30a20000/pmic@4b} {
u-boot,dm-spl;
@@ -28,27 +13,6 @@
u-boot,dm-spl;
};
-&aips1 {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
-};
-
-&aips2 {
- u-boot,dm-spl;
-};
-
-&aips3 {
- u-boot,dm-spl;
-};
-
-&clk {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
- /delete-property/ assigned-clocks;
- /delete-property/ assigned-clock-parents;
- /delete-property/ assigned-clock-rates;
-};
-
&gpio1 {
u-boot,dm-spl;
};
@@ -61,15 +25,6 @@
u-boot,dm-spl;
};
-&iomuxc {
- u-boot,dm-spl;
-};
-
-&osc_24m {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
-};
-
&pca6416_0 {
compatible = "ti,tca6416";
};
@@ -106,10 +61,6 @@
u-boot,off-on-delay-us = <20000>;
};
-&spba1 {
- u-boot,dm-spl;
-};
-
&uart2 {
u-boot,dm-spl;
};
@@ -132,133 +83,6 @@
mmc-hs400-enhanced-strobe;
};
-&wdog1 {
- u-boot,dm-spl;
-};
-
&pinctrl_wdog {
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>;
- };
-
- ddr-1d-imem-fw {
- filename = "lpddr4_pmu_train_1d_imem.bin";
- type = "blob-ext";
- align-end = <4>;
- };
-
- ddr-1d-dmem-fw {
- filename = "lpddr4_pmu_train_1d_dmem.bin";
- type = "blob-ext";
- align-end = <4>;
- };
-
- ddr-2d-imem-fw {
- filename = "lpddr4_pmu_train_2d_imem.bin";
- type = "blob-ext";
- align-end = <4>;
- };
-
- ddr-2d-dmem-fw {
- filename = "lpddr4_pmu_train_2d_dmem.bin";
- type = "blob-ext";
- align-end = <4>;
- };
- };
-
-
- spl {
- filename = "spl.bin";
-
- mkimage {
- args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
-
- 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>;
-
- 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 = <0x960000>;
- entry = <0x960000>;
-
- atf_blob: blob-ext {
- filename = "bl31.bin";
- };
- };
-
- fdt {
- description = "NAME";
- type = "flat_dt";
- compression = "none";
-
- uboot_fdt_blob: blob-ext {
- filename = "u-boot.dtb";
- };
- };
- };
-
- configurations {
- default = "conf";
-
- conf {
- description = "NAME";
- firmware = "uboot";
- loadables = "atf";
- fdt = "fdt";
- };
- };
- };
- };
-
- imx-boot {
- filename = "flash.bin";
- pad-byte = <0x00>;
-
- spl: blob-ext@1 {
- offset = <0x0>;
- filename = "spl.bin";
- };
-
- uboot: blob-ext@2 {
- offset = <0x58000>;
- filename = "u-boot.itb";
- };
- };
-};
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH V2 2/7] arm: dts: imx8mn-beacon-kit: Consolidate with imx8mn-u-boot
2022-10-22 0:58 ` [PATCH V2 2/7] arm: dts: imx8mn-beacon-kit: Consolidate with imx8mn-u-boot Adam Ford
@ 2022-10-24 13:55 ` sbabic
0 siblings, 0 replies; 15+ messages in thread
From: sbabic @ 2022-10-24 13:55 UTC (permalink / raw)
To: Adam Ford, u-boot
> Now that a unified imx8mn-u-boot is available, remove duplicated
> code for generating flash.bin and other common imx8mn peripherals.
> Signed-off-by: Adam Ford <aford173@gmail.com>
> diff --git a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
> index 0efa6862eb..3180d57239 100644
> --- a/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mn-beacon-kit-u-boot.dtsi
> @@ -1,24 +1,9 @@
> // SPDX-License-Identifier: GPL-2.0+
> /*
> - * Copyright 2020 Compass Electronics Group, LLC
> + * Copyright 2022 Logic PD, Inc. dba Beacon EmbeddedWorks
> */
>
> -/ {
> - binman: binman {
> - multiple-images;
> - };
> -
> - wdt-reboot {
> - compatible = "wdt-reboot";
> - wdt = <&wdog1>;
> - u-boot,dm-spl;
> - };
> -};
> -
> -&{/soc@0} {
> - u-boot,dm-pre-reloc;
> - u-boot,dm-spl;
> -};
> +#include "imx8mn-u-boot.dtsi"
>
> &{/soc@0/bus@30800000/i2c@30a20000/pmic@4b} {
> u-boot,dm-spl;
> @@ -28,27 +13,6 @@
> u-boot,dm-spl;
> };
>
> -&aips1 {
> - u-boot,dm-spl;
> - u-boot,dm-pre-reloc;
> -};
> -
> -&aips2 {
> - u-boot,dm-spl;
> -};
> -
> -&aips3 {
> - u-boot,dm-spl;
> -};
> -
> -&clk {
> - u-boot,dm-spl;
> - u-boot,dm-pre-reloc;
> - /delete-property/ assigned-clocks;
> - /delete-property/ assigned-clock-parents;
> - /delete-property/ assigned-clock-rates;
> -};
> -
> &gpio1 {
> u-boot,dm-spl;
> };
> @@ -61,15 +25,6 @@
> u-boot,dm-spl;
> };
>
> -&iomuxc {
> - u-boot,dm-spl;
> -};
> -
> -&osc_24m {
> - u-boot,dm-spl;
> - u-boot,dm-pre-reloc;
> -};
> -
> &pca6416_0 {
> compatible = "ti,tca6416";
> };
> @@ -106,10 +61,6 @@
> u-boot,off-on-delay-us = <20000>;
> };
>
> -&spba1 {
> - u-boot,dm-spl;
> -};
> -
> &uart2 {
> u-boot,dm-spl;
> };
> @@ -132,133 +83,6 @@
> mmc-hs400-enhanced-strobe;
> };
>
> -&wdog1 {
> - u-boot,dm-spl;
> -};
> -
> &pinctrl_wdog {
> 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>;
> - };
> -
> - ddr-1d-imem-fw {
> - filename = "lpddr4_pmu_train_1d_imem.bin";
> - type = "blob-ext";
> - align-end = <4>;
> - };
> -
> - ddr-1d-dmem-fw {
> - filename = "lpddr4_pmu_train_1d_dmem.bin";
> - type = "blob-ext";
> - align-end = <4>;
> - };
> -
> - ddr-2d-imem-fw {
> - filename = "lpddr4_pmu_train_2d_imem.bin";
> - type = "blob-ext";
> - align-end = <4>;
> - };
> -
> - ddr-2d-dmem-fw {
> - filename = "lpddr4_pmu_train_2d_dmem.bin";
> - type = "blob-ext";
> - align-end = <4>;
> - };
> - };
> -
> -
> - spl {
> - filename = "spl.bin";
> -
> - mkimage {
> - args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
> -
> - 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>;
> -
> - 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 = <0x960000>;
> - entry = <0x960000>;
> -
> - atf_blob: blob-ext {
> - filename = "bl31.bin";
> - };
> - };
> -
> - fdt {
> - description = "NAME";
> - type = "flat_dt";
> - compression = "none";
> -
> - uboot_fdt_blob: blob-ext {
> - filename = "u-boot.dtb";
> - };
> - };
> - };
> -
> - configurations {
> - default = "conf";
> -
> - conf {
> - description = "NAME";
> - firmware = "uboot";
> - loadables = "atf";
> - fdt = "fdt";
> - };
> - };
> - };
> - };
> -
> - imx-boot {
> - filename = "flash.bin";
> - pad-byte = <0x00>;
> -
> - spl: blob-ext@1 {
> - offset = <0x0>;
> - filename = "spl.bin";
> - };
> -
> - uboot: blob-ext@2 {
> - offset = <0x58000>;
> - filename = "u-boot.itb";
> - };
> - };
> -};
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
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: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH V2 3/7] arm: dts: imx8mn-bsh-smm-s2: Consolidate with imx8mn-u-boot
2022-10-22 0:58 [PATCH V2 0/7] arm: dts: Create common imx8mn-u-boot Adam Ford
2022-10-22 0:58 ` [PATCH V2 1/7] arm: dts: imx8mn-u-boot: Create common imx8mn-u-boot.dtsi Adam Ford
2022-10-22 0:58 ` [PATCH V2 2/7] arm: dts: imx8mn-beacon-kit: Consolidate with imx8mn-u-boot Adam Ford
@ 2022-10-22 0:58 ` Adam Ford
2022-10-24 13:55 ` sbabic
2022-10-22 0:58 ` [PATCH V2 4/7] arm: dts: imx8mn-ddr4-evk: " Adam Ford
` (3 subsequent siblings)
6 siblings, 1 reply; 15+ messages in thread
From: Adam Ford @ 2022-10-22 0:58 UTC (permalink / raw)
To: u-boot
Cc: Adam Ford, Stefano Babic, Fabio Estevam, NXP i.MX U-Boot Team,
Ariel D'Alessandro, Michael Trimarchi, Tim Harvey
Now that a unified imx8mn-u-boot is available, remove duplicated
code for generating flash.bin and other common imx8mn peripherals.
Signed-off-by: Adam Ford <aford173@gmail.com>
diff --git a/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi b/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi
index c4ae7ca4f3..3967e0bd15 100644
--- a/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi
+++ b/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi
@@ -4,22 +4,7 @@
* Copyright 2021 BSH Hausgeraete GmbH
*/
-/ {
- binman: binman {
- multiple-images;
- };
-
- wdt-reboot {
- compatible = "wdt-reboot";
- wdt = <&wdog1>;
- u-boot,dm-spl;
- };
-};
-
-&{/soc@0} {
- u-boot,dm-pre-reloc;
- u-boot,dm-spl;
-};
+#include "imx8mn-u-boot.dtsi"
&{/soc@0/bus@30800000/i2c@30a20000/pmic@4b} {
u-boot,dm-spl;
@@ -29,27 +14,6 @@
u-boot,dm-spl;
};
-&aips1 {
- u-boot,dm-pre-reloc;
- u-boot,dm-spl;
-};
-
-&aips3 {
- u-boot,dm-spl;
-};
-
-&aips4 {
- u-boot,dm-spl;
-};
-
-&clk {
- u-boot,dm-pre-reloc;
- u-boot,dm-spl;
- /delete-property/ assigned-clocks;
- /delete-property/ assigned-clock-parents;
- /delete-property/ assigned-clock-rates;
-};
-
&gpio1 {
u-boot,dm-spl;
};
@@ -66,15 +30,6 @@
u-boot,dm-spl;
};
-&iomuxc {
- u-boot,dm-spl;
-};
-
-&osc_24m {
- u-boot,dm-pre-reloc;
- u-boot,dm-spl;
-};
-
&pinctrl_i2c1 {
u-boot,dm-spl;
};
@@ -98,128 +53,3 @@
&wdog1 {
u-boot,dm-spl;
};
-
-&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";
- };
-
- ddr-1d-imem-fw {
- filename = "ddr3_imem_1d.bin";
- align-end = <4>;
- type = "blob-ext";
- };
-
- ddr-1d-dmem-fw {
- filename = "ddr3_dmem_1d.bin";
- align-end = <4>;
- type = "blob-ext";
- };
- };
-
- spl {
- filename = "spl.bin";
-
- mkimage {
- args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
-
- 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 = <0x960000>;
- load = <0x960000>;
- type = "firmware";
-
- atf_blob {
- filename = "bl31.bin";
- type = "atf-bl31";
- };
- };
-
- binman_fip: fip {
- arch = "arm64";
- compression = "none";
- description = "Trusted Firmware FIP";
- load = <0x40310000>;
- type = "firmware";
- };
-
- @fdt-SEQ {
- compression = "none";
- description = "NAME";
- type = "flat_dt";
-
- uboot_fdt_blob {
- filename = "u-boot.dtb";
- type = "blob-ext";
- };
- };
- };
-
- configurations {
- default = "@config-DEFAULT-SEQ";
-
- binman_configuration: @config-SEQ {
- description = "NAME";
- fdt = "fdt-SEQ";
- firmware = "uboot";
- loadables = "atf";
- };
- };
- };
- };
-
- 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 = <0x58000>;
- type = "blob-ext";
- };
- };
-};
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH V2 3/7] arm: dts: imx8mn-bsh-smm-s2: Consolidate with imx8mn-u-boot
2022-10-22 0:58 ` [PATCH V2 3/7] arm: dts: imx8mn-bsh-smm-s2: " Adam Ford
@ 2022-10-24 13:55 ` sbabic
0 siblings, 0 replies; 15+ messages in thread
From: sbabic @ 2022-10-24 13:55 UTC (permalink / raw)
To: Adam Ford, u-boot
> Now that a unified imx8mn-u-boot is available, remove duplicated
> code for generating flash.bin and other common imx8mn peripherals.
> Signed-off-by: Adam Ford <aford173@gmail.com>
> diff --git a/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi b/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi
> index c4ae7ca4f3..3967e0bd15 100644
> --- a/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi
> +++ b/arch/arm/dts/imx8mn-bsh-smm-s2-u-boot-common.dtsi
> @@ -4,22 +4,7 @@
> * Copyright 2021 BSH Hausgeraete GmbH
> */
>
> -/ {
> - binman: binman {
> - multiple-images;
> - };
> -
> - wdt-reboot {
> - compatible = "wdt-reboot";
> - wdt = <&wdog1>;
> - u-boot,dm-spl;
> - };
> -};
> -
> -&{/soc@0} {
> - u-boot,dm-pre-reloc;
> - u-boot,dm-spl;
> -};
> +#include "imx8mn-u-boot.dtsi"
>
> &{/soc@0/bus@30800000/i2c@30a20000/pmic@4b} {
> u-boot,dm-spl;
> @@ -29,27 +14,6 @@
> u-boot,dm-spl;
> };
>
> -&aips1 {
> - u-boot,dm-pre-reloc;
> - u-boot,dm-spl;
> -};
> -
> -&aips3 {
> - u-boot,dm-spl;
> -};
> -
> -&aips4 {
> - u-boot,dm-spl;
> -};
> -
> -&clk {
> - u-boot,dm-pre-reloc;
> - u-boot,dm-spl;
> - /delete-property/ assigned-clocks;
> - /delete-property/ assigned-clock-parents;
> - /delete-property/ assigned-clock-rates;
> -};
> -
> &gpio1 {
> u-boot,dm-spl;
> };
> @@ -66,15 +30,6 @@
> u-boot,dm-spl;
> };
>
> -&iomuxc {
> - u-boot,dm-spl;
> -};
> -
> -&osc_24m {
> - u-boot,dm-pre-reloc;
> - u-boot,dm-spl;
> -};
> -
> &pinctrl_i2c1 {
> u-boot,dm-spl;
> };
> @@ -98,128 +53,3 @@
> &wdog1 {
> u-boot,dm-spl;
> };
> -
> -&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";
> - };
> -
> - ddr-1d-imem-fw {
> - filename = "ddr3_imem_1d.bin";
> - align-end = <4>;
> - type = "blob-ext";
> - };
> -
> - ddr-1d-dmem-fw {
> - filename = "ddr3_dmem_1d.bin";
> - align-end = <4>;
> - type = "blob-ext";
> - };
> - };
> -
> - spl {
> - filename = "spl.bin";
> -
> - mkimage {
> - args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
> -
> - 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 = <0x960000>;
> - load = <0x960000>;
> - type = "firmware";
> -
> - atf_blob {
> - filename = "bl31.bin";
> - type = "atf-bl31";
> - };
> - };
> -
> - binman_fip: fip {
> - arch = "arm64";
> - compression = "none";
> - description = "Trusted Firmware FIP";
> - load = <0x40310000>;
> - type = "firmware";
> - };
> -
> - @fdt-SEQ {
> - compression = "none";
> - description = "NAME";
> - type = "flat_dt";
> -
> - uboot_fdt_blob {
> - filename = "u-boot.dtb";
> - type = "blob-ext";
> - };
> - };
> - };
> -
> - configurations {
> - default = "@config-DEFAULT-SEQ";
> -
> - binman_configuration: @config-SEQ {
> - description = "NAME";
> - fdt = "fdt-SEQ";
> - firmware = "uboot";
> - loadables = "atf";
> - };
> - };
> - };
> - };
> -
> - 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 = <0x58000>;
> - type = "blob-ext";
> - };
> - };
> -};
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
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: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH V2 4/7] arm: dts: imx8mn-ddr4-evk: Consolidate with imx8mn-u-boot
2022-10-22 0:58 [PATCH V2 0/7] arm: dts: Create common imx8mn-u-boot Adam Ford
` (2 preceding siblings ...)
2022-10-22 0:58 ` [PATCH V2 3/7] arm: dts: imx8mn-bsh-smm-s2: " Adam Ford
@ 2022-10-22 0:58 ` Adam Ford
2022-10-24 13:55 ` sbabic
2022-10-22 0:58 ` [PATCH V2 5/7] arm: dts: imx8mn-evk: " Adam Ford
` (2 subsequent siblings)
6 siblings, 1 reply; 15+ messages in thread
From: Adam Ford @ 2022-10-22 0:58 UTC (permalink / raw)
To: u-boot
Cc: Adam Ford, Stefano Babic, Fabio Estevam, NXP i.MX U-Boot Team,
Ariel D'Alessandro, Michael Trimarchi, Tim Harvey
Now that a unified imx8mn-u-boot is available, remove duplicated
code for generating flash.bin and other common imx8mn peripherals.
Signed-off-by: Adam Ford <aford173@gmail.com>
diff --git a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
index 3fdb20cb35..54f3ebe88b 100644
--- a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
@@ -3,66 +3,7 @@
* Copyright 2019, 2021 NXP
*/
-/ {
- binman: binman {
- multiple-images;
- };
-
- wdt-reboot {
- compatible = "wdt-reboot";
- wdt = <&wdog1>;
- u-boot,dm-spl;
- };
- firmware {
- optee {
- compatible = "linaro,optee-tz";
- method = "smc";
- };
- };
-};
-
-&{/soc@0} {
- u-boot,dm-pre-reloc;
- u-boot,dm-spl;
-};
-
-&spba1 {
- u-boot,dm-spl;
-};
-
-&spba1 {
- u-boot,dm-spl;
-};
-
-&clk {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
- /delete-property/ assigned-clocks;
- /delete-property/ assigned-clock-parents;
- /delete-property/ assigned-clock-rates;
-};
-
-&osc_24m {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
-};
-
-&aips1 {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
-};
-
-&aips2 {
- u-boot,dm-spl;
-};
-
-&aips3 {
- u-boot,dm-spl;
-};
-
-&iomuxc {
- u-boot,dm-spl;
-};
+#include "imx8mn-u-boot.dtsi"
&pinctrl_reg_usdhc2_vmmc {
u-boot,dm-spl;
@@ -147,130 +88,3 @@
mmc-hs400-1_8v;
mmc-hs400-enhanced-strobe;
};
-
-&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>;
- };
-
- ddr-1d-imem-fw {
- filename = "ddr4_imem_1d_201810.bin";
- type = "blob-ext";
- align-end = <4>;
- };
-
- ddr-1d-dmem-fw {
- filename = "ddr4_dmem_1d_201810.bin";
- type = "blob-ext";
- align-end = <4>;
- };
-
- ddr-2d-imem-fw {
- filename = "ddr4_imem_2d_201810.bin";
- type = "blob-ext";
- align-end = <4>;
- };
-
- ddr-2d-dmem-fw {
- filename = "ddr4_dmem_2d_201810.bin";
- type = "blob-ext";
- align-end = <4>;
- };
- };
-
-
- spl {
- filename = "spl.bin";
-
- mkimage {
- args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
-
- 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>;
-
- 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 = <0x960000>;
- entry = <0x960000>;
-
- atf_blob: blob-ext {
- filename = "bl31.bin";
- };
- };
-
- fdt {
- description = "NAME";
- type = "flat_dt";
- compression = "none";
-
- uboot_fdt_blob: blob-ext {
- filename = "u-boot.dtb";
- };
- };
- };
-
- configurations {
- default = "conf";
-
- conf {
- description = "NAME";
- firmware = "uboot";
- loadables = "atf";
- fdt = "fdt";
- };
- };
- };
- };
-
- imx-boot {
- filename = "flash.bin";
- pad-byte = <0x00>;
-
- spl: blob-ext@1 {
- offset = <0x0>;
- filename = "spl.bin";
- };
-
- uboot: blob-ext@2 {
- offset = <0x58000>;
- filename = "u-boot.itb";
- };
- };
-};
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH V2 4/7] arm: dts: imx8mn-ddr4-evk: Consolidate with imx8mn-u-boot
2022-10-22 0:58 ` [PATCH V2 4/7] arm: dts: imx8mn-ddr4-evk: " Adam Ford
@ 2022-10-24 13:55 ` sbabic
0 siblings, 0 replies; 15+ messages in thread
From: sbabic @ 2022-10-24 13:55 UTC (permalink / raw)
To: Adam Ford, u-boot
> Now that a unified imx8mn-u-boot is available, remove duplicated
> code for generating flash.bin and other common imx8mn peripherals.
> Signed-off-by: Adam Ford <aford173@gmail.com>
> diff --git a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
> index 3fdb20cb35..54f3ebe88b 100644
> --- a/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mn-ddr4-evk-u-boot.dtsi
> @@ -3,66 +3,7 @@
> * Copyright 2019, 2021 NXP
> */
>
> -/ {
> - binman: binman {
> - multiple-images;
> - };
> -
> - wdt-reboot {
> - compatible = "wdt-reboot";
> - wdt = <&wdog1>;
> - u-boot,dm-spl;
> - };
> - firmware {
> - optee {
> - compatible = "linaro,optee-tz";
> - method = "smc";
> - };
> - };
> -};
> -
> -&{/soc@0} {
> - u-boot,dm-pre-reloc;
> - u-boot,dm-spl;
> -};
> -
> -&spba1 {
> - u-boot,dm-spl;
> -};
> -
> -&spba1 {
> - u-boot,dm-spl;
> -};
> -
> -&clk {
> - u-boot,dm-spl;
> - u-boot,dm-pre-reloc;
> - /delete-property/ assigned-clocks;
> - /delete-property/ assigned-clock-parents;
> - /delete-property/ assigned-clock-rates;
> -};
> -
> -&osc_24m {
> - u-boot,dm-spl;
> - u-boot,dm-pre-reloc;
> -};
> -
> -&aips1 {
> - u-boot,dm-spl;
> - u-boot,dm-pre-reloc;
> -};
> -
> -&aips2 {
> - u-boot,dm-spl;
> -};
> -
> -&aips3 {
> - u-boot,dm-spl;
> -};
> -
> -&iomuxc {
> - u-boot,dm-spl;
> -};
> +#include "imx8mn-u-boot.dtsi"
>
> &pinctrl_reg_usdhc2_vmmc {
> u-boot,dm-spl;
> @@ -147,130 +88,3 @@
> mmc-hs400-1_8v;
> mmc-hs400-enhanced-strobe;
> };
> -
> -&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>;
> - };
> -
> - ddr-1d-imem-fw {
> - filename = "ddr4_imem_1d_201810.bin";
> - type = "blob-ext";
> - align-end = <4>;
> - };
> -
> - ddr-1d-dmem-fw {
> - filename = "ddr4_dmem_1d_201810.bin";
> - type = "blob-ext";
> - align-end = <4>;
> - };
> -
> - ddr-2d-imem-fw {
> - filename = "ddr4_imem_2d_201810.bin";
> - type = "blob-ext";
> - align-end = <4>;
> - };
> -
> - ddr-2d-dmem-fw {
> - filename = "ddr4_dmem_2d_201810.bin";
> - type = "blob-ext";
> - align-end = <4>;
> - };
> - };
> -
> -
> - spl {
> - filename = "spl.bin";
> -
> - mkimage {
> - args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
> -
> - 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>;
> -
> - 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 = <0x960000>;
> - entry = <0x960000>;
> -
> - atf_blob: blob-ext {
> - filename = "bl31.bin";
> - };
> - };
> -
> - fdt {
> - description = "NAME";
> - type = "flat_dt";
> - compression = "none";
> -
> - uboot_fdt_blob: blob-ext {
> - filename = "u-boot.dtb";
> - };
> - };
> - };
> -
> - configurations {
> - default = "conf";
> -
> - conf {
> - description = "NAME";
> - firmware = "uboot";
> - loadables = "atf";
> - fdt = "fdt";
> - };
> - };
> - };
> - };
> -
> - imx-boot {
> - filename = "flash.bin";
> - pad-byte = <0x00>;
> -
> - spl: blob-ext@1 {
> - offset = <0x0>;
> - filename = "spl.bin";
> - };
> -
> - uboot: blob-ext@2 {
> - offset = <0x58000>;
> - filename = "u-boot.itb";
> - };
> - };
> -};
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
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: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH V2 5/7] arm: dts: imx8mn-evk: Consolidate with imx8mn-u-boot
2022-10-22 0:58 [PATCH V2 0/7] arm: dts: Create common imx8mn-u-boot Adam Ford
` (3 preceding siblings ...)
2022-10-22 0:58 ` [PATCH V2 4/7] arm: dts: imx8mn-ddr4-evk: " Adam Ford
@ 2022-10-22 0:58 ` Adam Ford
2022-10-24 13:54 ` sbabic
2022-10-22 0:58 ` [PATCH V2 6/7] arm: dts: imx8mn-var-som-symphony: " Adam Ford
2022-10-22 0:58 ` [PATCH V2 7/7] arm: dts: imx8mn-venice: " Adam Ford
6 siblings, 1 reply; 15+ messages in thread
From: Adam Ford @ 2022-10-22 0:58 UTC (permalink / raw)
To: u-boot
Cc: Adam Ford, Stefano Babic, Fabio Estevam, NXP i.MX U-Boot Team,
Ariel D'Alessandro, Michael Trimarchi, Tim Harvey
Now that a unified imx8mn-u-boot is available, remove duplicated
code for generating flash.bin and other common imx8mn peripherals.
Signed-off-by: Adam Ford <aford173@gmail.com>
diff --git a/arch/arm/dts/imx8mn-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-evk-u-boot.dtsi
index c4b83d3f7e..6c6c949f43 100644
--- a/arch/arm/dts/imx8mn-evk-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-evk-u-boot.dtsi
@@ -24,111 +24,3 @@
&pinctrl_pmic {
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>;
- };
-
- ddr-1d-imem-fw {
- filename = "lpddr4_pmu_train_1d_imem.bin";
- type = "blob-ext";
- align-end = <4>;
- };
-
- ddr-1d-dmem-fw {
- filename = "lpddr4_pmu_train_1d_dmem.bin";
- type = "blob-ext";
- align-end = <4>;
- };
-
- ddr-2d-imem-fw {
- filename = "lpddr4_pmu_train_2d_imem.bin";
- type = "blob-ext";
- align-end = <4>;
- };
-
- ddr-2d-dmem-fw {
- filename = "lpddr4_pmu_train_2d_dmem.bin";
- type = "blob-ext";
- align-end = <4>;
- };
- };
-
-
- spl {
- filename = "spl.bin";
-
- mkimage {
- args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
-
- 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>;
-
- 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 = <0x960000>;
- entry = <0x960000>;
-
- atf_blob: blob-ext {
- filename = "bl31.bin";
- };
- };
-
- fdt {
- description = "NAME";
- type = "flat_dt";
- compression = "none";
-
- uboot_fdt_blob: blob-ext {
- filename = "u-boot.dtb";
- };
- };
- };
-
- configurations {
- default = "conf";
-
- conf {
- description = "NAME";
- firmware = "uboot";
- loadables = "atf";
- fdt = "fdt";
- };
- };
- };
- };
-};
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH V2 5/7] arm: dts: imx8mn-evk: Consolidate with imx8mn-u-boot
2022-10-22 0:58 ` [PATCH V2 5/7] arm: dts: imx8mn-evk: " Adam Ford
@ 2022-10-24 13:54 ` sbabic
0 siblings, 0 replies; 15+ messages in thread
From: sbabic @ 2022-10-24 13:54 UTC (permalink / raw)
To: Adam Ford, u-boot
> Now that a unified imx8mn-u-boot is available, remove duplicated
> code for generating flash.bin and other common imx8mn peripherals.
> Signed-off-by: Adam Ford <aford173@gmail.com>
> diff --git a/arch/arm/dts/imx8mn-evk-u-boot.dtsi b/arch/arm/dts/imx8mn-evk-u-boot.dtsi
> index c4b83d3f7e..6c6c949f43 100644
> --- a/arch/arm/dts/imx8mn-evk-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mn-evk-u-boot.dtsi
> @@ -24,111 +24,3 @@
> &pinctrl_pmic {
> 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>;
> - };
> -
> - ddr-1d-imem-fw {
> - filename = "lpddr4_pmu_train_1d_imem.bin";
> - type = "blob-ext";
> - align-end = <4>;
> - };
> -
> - ddr-1d-dmem-fw {
> - filename = "lpddr4_pmu_train_1d_dmem.bin";
> - type = "blob-ext";
> - align-end = <4>;
> - };
> -
> - ddr-2d-imem-fw {
> - filename = "lpddr4_pmu_train_2d_imem.bin";
> - type = "blob-ext";
> - align-end = <4>;
> - };
> -
> - ddr-2d-dmem-fw {
> - filename = "lpddr4_pmu_train_2d_dmem.bin";
> - type = "blob-ext";
> - align-end = <4>;
> - };
> - };
> -
> -
> - spl {
> - filename = "spl.bin";
> -
> - mkimage {
> - args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
> -
> - 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>;
> -
> - 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 = <0x960000>;
> - entry = <0x960000>;
> -
> - atf_blob: blob-ext {
> - filename = "bl31.bin";
> - };
> - };
> -
> - fdt {
> - description = "NAME";
> - type = "flat_dt";
> - compression = "none";
> -
> - uboot_fdt_blob: blob-ext {
> - filename = "u-boot.dtb";
> - };
> - };
> - };
> -
> - configurations {
> - default = "conf";
> -
> - conf {
> - description = "NAME";
> - firmware = "uboot";
> - loadables = "atf";
> - fdt = "fdt";
> - };
> - };
> - };
> - };
> -};
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
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: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH V2 6/7] arm: dts: imx8mn-var-som-symphony: Consolidate with imx8mn-u-boot
2022-10-22 0:58 [PATCH V2 0/7] arm: dts: Create common imx8mn-u-boot Adam Ford
` (4 preceding siblings ...)
2022-10-22 0:58 ` [PATCH V2 5/7] arm: dts: imx8mn-evk: " Adam Ford
@ 2022-10-22 0:58 ` Adam Ford
2022-10-24 13:54 ` sbabic
2022-10-22 0:58 ` [PATCH V2 7/7] arm: dts: imx8mn-venice: " Adam Ford
6 siblings, 1 reply; 15+ messages in thread
From: Adam Ford @ 2022-10-22 0:58 UTC (permalink / raw)
To: u-boot
Cc: Adam Ford, Stefano Babic, Fabio Estevam, NXP i.MX U-Boot Team,
Ariel D'Alessandro, Michael Trimarchi, Tim Harvey
Now that a unified imx8mn-u-boot is available, remove duplicated
code for generating flash.bin and other common imx8mn peripherals.
Signed-off-by: Adam Ford <aford173@gmail.com>
diff --git a/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi b/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi
index ed1ab10ded..a20683155c 100644
--- a/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi
@@ -3,22 +3,7 @@
* Copyright 2021 Collabora Ltd.
*/
-/ {
- binman: binman {
- multiple-images;
- };
-
- wdt-reboot {
- compatible = "wdt-reboot";
- wdt = <&wdog1>;
- u-boot,dm-spl;
- };
-};
-
-&{/soc@0} {
- u-boot,dm-pre-reloc;
- u-boot,dm-spl;
-};
+#include "imx8mn-u-boot.dtsi"
&{/soc@0/bus@30800000/i2c@30a20000/pmic@4b} {
u-boot,dm-spl;
@@ -28,27 +13,6 @@
u-boot,dm-spl;
};
-&aips1 {
- u-boot,dm-pre-reloc;
- u-boot,dm-spl;
-};
-
-&aips3 {
- u-boot,dm-spl;
-};
-
-&aips4 {
- u-boot,dm-spl;
-};
-
-&clk {
- u-boot,dm-pre-reloc;
- u-boot,dm-spl;
- /delete-property/ assigned-clocks;
- /delete-property/ assigned-clock-parents;
- /delete-property/ assigned-clock-rates;
-};
-
&gpio1 {
u-boot,dm-spl;
};
@@ -65,15 +29,6 @@
u-boot,dm-spl;
};
-&iomuxc {
- u-boot,dm-spl;
-};
-
-&osc_24m {
- u-boot,dm-pre-reloc;
- u-boot,dm-spl;
-};
-
&pinctrl_i2c1 {
u-boot,dm-spl;
};
@@ -113,144 +68,3 @@
&usdhc3 {
u-boot,dm-spl;
};
-
-&wdog1 {
- u-boot,dm-spl;
-};
-
-&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";
- };
-
- ddr-1d-imem-fw {
- filename = "ddr4_imem_1d.bin";
- align-end = <4>;
- type = "blob-ext";
- };
-
- ddr-1d-dmem-fw {
- filename = "ddr4_dmem_1d.bin";
- align-end = <4>;
- type = "blob-ext";
- };
-
- ddr-2d-imem-fw {
- filename = "ddr4_imem_2d.bin";
- align-end = <4>;
- type = "blob-ext";
- };
-
- ddr-2d-dmem-fw {
- filename = "ddr4_dmem_2d.bin";
- align-end = <4>;
- type = "blob-ext";
- };
- };
-
- spl {
- filename = "spl.bin";
-
- mkimage {
- args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
-
- 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 = <0x960000>;
- load = <0x960000>;
- type = "firmware";
-
- atf_blob {
- filename = "bl31.bin";
- type = "atf-bl31";
- };
- };
-
- binman_fip: fip {
- arch = "arm64";
- compression = "none";
- description = "Trusted Firmware FIP";
- load = <0x40310000>;
- type = "firmware";
- };
-
- @fdt-SEQ {
- compression = "none";
- description = "NAME";
- type = "flat_dt";
-
- uboot_fdt_blob {
- filename = "u-boot.dtb";
- type = "blob-ext";
- };
- };
- };
-
- configurations {
- default = "@config-DEFAULT-SEQ";
-
- binman_configuration: @config-SEQ {
- description = "NAME";
- fdt = "fdt-SEQ";
- firmware = "uboot";
- loadables = "atf";
- };
- };
- };
- };
-
- 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 = <0x58000>;
- type = "blob-ext";
- };
- };
-};
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH V2 6/7] arm: dts: imx8mn-var-som-symphony: Consolidate with imx8mn-u-boot
2022-10-22 0:58 ` [PATCH V2 6/7] arm: dts: imx8mn-var-som-symphony: " Adam Ford
@ 2022-10-24 13:54 ` sbabic
0 siblings, 0 replies; 15+ messages in thread
From: sbabic @ 2022-10-24 13:54 UTC (permalink / raw)
To: Adam Ford, u-boot
> Now that a unified imx8mn-u-boot is available, remove duplicated
> code for generating flash.bin and other common imx8mn peripherals.
> Signed-off-by: Adam Ford <aford173@gmail.com>
> diff --git a/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi b/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi
> index ed1ab10ded..a20683155c 100644
> --- a/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mn-var-som-symphony-u-boot.dtsi
> @@ -3,22 +3,7 @@
> * Copyright 2021 Collabora Ltd.
> */
>
> -/ {
> - binman: binman {
> - multiple-images;
> - };
> -
> - wdt-reboot {
> - compatible = "wdt-reboot";
> - wdt = <&wdog1>;
> - u-boot,dm-spl;
> - };
> -};
> -
> -&{/soc@0} {
> - u-boot,dm-pre-reloc;
> - u-boot,dm-spl;
> -};
> +#include "imx8mn-u-boot.dtsi"
>
> &{/soc@0/bus@30800000/i2c@30a20000/pmic@4b} {
> u-boot,dm-spl;
> @@ -28,27 +13,6 @@
> u-boot,dm-spl;
> };
>
> -&aips1 {
> - u-boot,dm-pre-reloc;
> - u-boot,dm-spl;
> -};
> -
> -&aips3 {
> - u-boot,dm-spl;
> -};
> -
> -&aips4 {
> - u-boot,dm-spl;
> -};
> -
> -&clk {
> - u-boot,dm-pre-reloc;
> - u-boot,dm-spl;
> - /delete-property/ assigned-clocks;
> - /delete-property/ assigned-clock-parents;
> - /delete-property/ assigned-clock-rates;
> -};
> -
> &gpio1 {
> u-boot,dm-spl;
> };
> @@ -65,15 +29,6 @@
> u-boot,dm-spl;
> };
>
> -&iomuxc {
> - u-boot,dm-spl;
> -};
> -
> -&osc_24m {
> - u-boot,dm-pre-reloc;
> - u-boot,dm-spl;
> -};
> -
> &pinctrl_i2c1 {
> u-boot,dm-spl;
> };
> @@ -113,144 +68,3 @@
> &usdhc3 {
> u-boot,dm-spl;
> };
> -
> -&wdog1 {
> - u-boot,dm-spl;
> -};
> -
> -&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";
> - };
> -
> - ddr-1d-imem-fw {
> - filename = "ddr4_imem_1d.bin";
> - align-end = <4>;
> - type = "blob-ext";
> - };
> -
> - ddr-1d-dmem-fw {
> - filename = "ddr4_dmem_1d.bin";
> - align-end = <4>;
> - type = "blob-ext";
> - };
> -
> - ddr-2d-imem-fw {
> - filename = "ddr4_imem_2d.bin";
> - align-end = <4>;
> - type = "blob-ext";
> - };
> -
> - ddr-2d-dmem-fw {
> - filename = "ddr4_dmem_2d.bin";
> - align-end = <4>;
> - type = "blob-ext";
> - };
> - };
> -
> - spl {
> - filename = "spl.bin";
> -
> - mkimage {
> - args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
> -
> - 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 = <0x960000>;
> - load = <0x960000>;
> - type = "firmware";
> -
> - atf_blob {
> - filename = "bl31.bin";
> - type = "atf-bl31";
> - };
> - };
> -
> - binman_fip: fip {
> - arch = "arm64";
> - compression = "none";
> - description = "Trusted Firmware FIP";
> - load = <0x40310000>;
> - type = "firmware";
> - };
> -
> - @fdt-SEQ {
> - compression = "none";
> - description = "NAME";
> - type = "flat_dt";
> -
> - uboot_fdt_blob {
> - filename = "u-boot.dtb";
> - type = "blob-ext";
> - };
> - };
> - };
> -
> - configurations {
> - default = "@config-DEFAULT-SEQ";
> -
> - binman_configuration: @config-SEQ {
> - description = "NAME";
> - fdt = "fdt-SEQ";
> - firmware = "uboot";
> - loadables = "atf";
> - };
> - };
> - };
> - };
> -
> - 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 = <0x58000>;
> - type = "blob-ext";
> - };
> - };
> -};
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
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: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH V2 7/7] arm: dts: imx8mn-venice: Consolidate with imx8mn-u-boot
2022-10-22 0:58 [PATCH V2 0/7] arm: dts: Create common imx8mn-u-boot Adam Ford
` (5 preceding siblings ...)
2022-10-22 0:58 ` [PATCH V2 6/7] arm: dts: imx8mn-var-som-symphony: " Adam Ford
@ 2022-10-22 0:58 ` Adam Ford
2022-10-24 13:56 ` sbabic
6 siblings, 1 reply; 15+ messages in thread
From: Adam Ford @ 2022-10-22 0:58 UTC (permalink / raw)
To: u-boot
Cc: Adam Ford, Stefano Babic, Fabio Estevam, NXP i.MX U-Boot Team,
Ariel D'Alessandro, Michael Trimarchi, Tim Harvey
Now that a unified imx8mn-u-boot is available, remove duplicated
code for generating flash.bin and other common imx8mn peripherals.
Signed-off-by: Adam Ford <aford173@gmail.com>
diff --git a/arch/arm/dts/imx8mn-venice-u-boot.dtsi b/arch/arm/dts/imx8mn-venice-u-boot.dtsi
index 42e4d935cf..aea48f2d79 100644
--- a/arch/arm/dts/imx8mn-venice-u-boot.dtsi
+++ b/arch/arm/dts/imx8mn-venice-u-boot.dtsi
@@ -3,60 +3,7 @@
* Copyright 2022 Gateworks Corporation
*/
-/ {
- binman: binman {
- multiple-images;
- };
-
- wdt-reboot {
- compatible = "wdt-reboot";
- wdt = <&wdog1>;
- u-boot,dm-spl;
- };
-};
-
-&{/soc@0} {
- u-boot,dm-pre-reloc;
- u-boot,dm-spl;
-};
-
-&spba1 {
- u-boot,dm-spl;
-};
-
-&spba1 {
- u-boot,dm-spl;
-};
-
-&clk {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
- /delete-property/ assigned-clocks;
- /delete-property/ assigned-clock-parents;
- /delete-property/ assigned-clock-rates;
-};
-
-&osc_24m {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
-};
-
-&aips1 {
- u-boot,dm-spl;
- u-boot,dm-pre-reloc;
-};
-
-&aips2 {
- u-boot,dm-spl;
-};
-
-&aips3 {
- u-boot,dm-spl;
-};
-
-&iomuxc {
- u-boot,dm-spl;
-};
+#include "imx8mn-u-boot.dtsi"
&gpio1 {
u-boot,dm-spl;
@@ -114,147 +61,6 @@
u-boot,dm-spl;
};
-&wdog1 {
- u-boot,dm-spl;
-};
-
&pinctrl_wdog {
u-boot,dm-spl;
};
-
-&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";
- };
-
- ddr-1d-imem-fw {
- filename = "lpddr4_pmu_train_1d_imem.bin";
- align-end = <4>;
- type = "blob-ext";
- };
-
- ddr-1d-dmem-fw {
- filename = "lpddr4_pmu_train_1d_dmem.bin";
- align-end = <4>;
- type = "blob-ext";
- };
-
- ddr-2d-imem-fw {
- filename = "lpddr4_pmu_train_2d_imem.bin";
- align-end = <4>;
- type = "blob-ext";
- };
-
- ddr-2d-dmem-fw {
- filename = "lpddr4_pmu_train_2d_dmem.bin";
- align-end = <4>;
- type = "blob-ext";
- };
- };
-
- spl {
- filename = "spl.bin";
-
- mkimage {
- args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
-
- 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 = <0x960000>;
- load = <0x960000>;
- type = "firmware";
-
- atf_blob {
- filename = "bl31.bin";
- type = "blob-ext";
- };
- };
-
- binman_fip: fip {
- arch = "arm64";
- compression = "none";
- description = "Trusted Firmware FIP";
- load = <0x40310000>;
- type = "firmware";
- };
-
- @fdt-SEQ {
- compression = "none";
- description = "NAME";
- type = "flat_dt";
-
- uboot_fdt_blob {
- filename = "u-boot.dtb";
- type = "blob-ext";
- };
- };
- };
-
- configurations {
- default = "@config-DEFAULT-SEQ";
-
- binman_configuration: @config-SEQ {
- description = "NAME";
- fdt = "fdt-SEQ";
- firmware = "uboot";
- loadables = "atf";
- };
- };
- };
- };
-
- 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 = <0x58000>;
- type = "blob-ext";
- };
- };
-};
--
2.34.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH V2 7/7] arm: dts: imx8mn-venice: Consolidate with imx8mn-u-boot
2022-10-22 0:58 ` [PATCH V2 7/7] arm: dts: imx8mn-venice: " Adam Ford
@ 2022-10-24 13:56 ` sbabic
0 siblings, 0 replies; 15+ messages in thread
From: sbabic @ 2022-10-24 13:56 UTC (permalink / raw)
To: Adam Ford, u-boot
> Now that a unified imx8mn-u-boot is available, remove duplicated
> code for generating flash.bin and other common imx8mn peripherals.
> Signed-off-by: Adam Ford <aford173@gmail.com>
> diff --git a/arch/arm/dts/imx8mn-venice-u-boot.dtsi b/arch/arm/dts/imx8mn-venice-u-boot.dtsi
> index 42e4d935cf..aea48f2d79 100644
> --- a/arch/arm/dts/imx8mn-venice-u-boot.dtsi
> +++ b/arch/arm/dts/imx8mn-venice-u-boot.dtsi
> @@ -3,60 +3,7 @@
> * Copyright 2022 Gateworks Corporation
> */
>
> -/ {
> - binman: binman {
> - multiple-images;
> - };
> -
> - wdt-reboot {
> - compatible = "wdt-reboot";
> - wdt = <&wdog1>;
> - u-boot,dm-spl;
> - };
> -};
> -
> -&{/soc@0} {
> - u-boot,dm-pre-reloc;
> - u-boot,dm-spl;
> -};
> -
> -&spba1 {
> - u-boot,dm-spl;
> -};
> -
> -&spba1 {
> - u-boot,dm-spl;
> -};
> -
> -&clk {
> - u-boot,dm-spl;
> - u-boot,dm-pre-reloc;
> - /delete-property/ assigned-clocks;
> - /delete-property/ assigned-clock-parents;
> - /delete-property/ assigned-clock-rates;
> -};
> -
> -&osc_24m {
> - u-boot,dm-spl;
> - u-boot,dm-pre-reloc;
> -};
> -
> -&aips1 {
> - u-boot,dm-spl;
> - u-boot,dm-pre-reloc;
> -};
> -
> -&aips2 {
> - u-boot,dm-spl;
> -};
> -
> -&aips3 {
> - u-boot,dm-spl;
> -};
> -
> -&iomuxc {
> - u-boot,dm-spl;
> -};
> +#include "imx8mn-u-boot.dtsi"
>
> &gpio1 {
> u-boot,dm-spl;
> @@ -114,147 +61,6 @@
> u-boot,dm-spl;
> };
>
> -&wdog1 {
> - u-boot,dm-spl;
> -};
> -
> &pinctrl_wdog {
> u-boot,dm-spl;
> };
> -
> -&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";
> - };
> -
> - ddr-1d-imem-fw {
> - filename = "lpddr4_pmu_train_1d_imem.bin";
> - align-end = <4>;
> - type = "blob-ext";
> - };
> -
> - ddr-1d-dmem-fw {
> - filename = "lpddr4_pmu_train_1d_dmem.bin";
> - align-end = <4>;
> - type = "blob-ext";
> - };
> -
> - ddr-2d-imem-fw {
> - filename = "lpddr4_pmu_train_2d_imem.bin";
> - align-end = <4>;
> - type = "blob-ext";
> - };
> -
> - ddr-2d-dmem-fw {
> - filename = "lpddr4_pmu_train_2d_dmem.bin";
> - align-end = <4>;
> - type = "blob-ext";
> - };
> - };
> -
> - spl {
> - filename = "spl.bin";
> -
> - mkimage {
> - args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x912000";
> -
> - 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 = <0x960000>;
> - load = <0x960000>;
> - type = "firmware";
> -
> - atf_blob {
> - filename = "bl31.bin";
> - type = "blob-ext";
> - };
> - };
> -
> - binman_fip: fip {
> - arch = "arm64";
> - compression = "none";
> - description = "Trusted Firmware FIP";
> - load = <0x40310000>;
> - type = "firmware";
> - };
> -
> - @fdt-SEQ {
> - compression = "none";
> - description = "NAME";
> - type = "flat_dt";
> -
> - uboot_fdt_blob {
> - filename = "u-boot.dtb";
> - type = "blob-ext";
> - };
> - };
> - };
> -
> - configurations {
> - default = "@config-DEFAULT-SEQ";
> -
> - binman_configuration: @config-SEQ {
> - description = "NAME";
> - fdt = "fdt-SEQ";
> - firmware = "uboot";
> - loadables = "atf";
> - };
> - };
> - };
> - };
> -
> - 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 = <0x58000>;
> - type = "blob-ext";
> - };
> - };
> -};
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
--
=====================================================================
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: sbabic@denx.de
=====================================================================
^ permalink raw reply [flat|nested] 15+ messages in thread