* [PATCH 1/2] board: phytec: imx8mm-phycore: Remove duplicate binman node
@ 2022-01-07 21:16 Adam Ford
2022-01-07 21:16 ` [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: Fix binman error Adam Ford
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Adam Ford @ 2022-01-07 21:16 UTC (permalink / raw)
To: u-boot; +Cc: frieder.schrempf, festevam, trini, t.remmet, Adam Ford
The binman node is part of the imx8mm-u-boot.dtsi file which
is duplicated in phycore-imx8mm-u-boot.dtsi and causes a build
error. Remove the duplicate.
Fixes: 3cbb31f0e848 ("arm64: dts: imx8mm: use common binman configuration")
Signed-off-by: Adam Ford <aford173@gmail.com>
diff --git a/arch/arm/dts/phycore-imx8mm-u-boot.dtsi b/arch/arm/dts/phycore-imx8mm-u-boot.dtsi
index f842e02c77..7c2dfb4a27 100644
--- a/arch/arm/dts/phycore-imx8mm-u-boot.dtsi
+++ b/arch/arm/dts/phycore-imx8mm-u-boot.dtsi
@@ -7,10 +7,6 @@
#include "imx8mm-u-boot.dtsi"
/ {
- binman: binman {
- multiple-images;
- };
-
wdt-reboot {
compatible = "wdt-reboot";
wdt = <&wdog1>;
@@ -73,121 +69,3 @@
&wdog1 {
u-boot,dm-spl;
};
-
-&binman {
- u-boot-spl-ddr {
- filename = "u-boot-spl-ddr.bin";
- pad-byte = <0xff>;
- align-size = <4>;
- align = <4>;
-
- u-boot-spl {
- align-end = <4>;
- };
-
- blob_1: blob-ext@1 {
- filename = "lpddr4_pmu_train_1d_imem.bin";
- size = <0x8000>;
- };
-
- blob_2: blob-ext@2 {
- filename = "lpddr4_pmu_train_1d_dmem.bin";
- size = <0x4000>;
- };
-
- blob_3: blob-ext@3 {
- filename = "lpddr4_pmu_train_2d_imem.bin";
- size = <0x8000>;
- };
-
- blob_4: blob-ext@4 {
- filename = "lpddr4_pmu_train_2d_dmem.bin";
- size = <0x4000>;
- };
- };
-
- spl {
- filename = "spl.bin";
-
- mkimage {
- args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x7e1000";
-
- blob {
- filename = "u-boot-spl-ddr.bin";
- };
- };
- };
-
- itb {
- filename = "u-boot.itb";
-
- fit {
- description = "Configuration to load ATF before U-Boot";
- #address-cells = <1>;
- fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
-
- images {
- uboot {
- description = "U-Boot (64-bit)";
- type = "standalone";
- arch = "arm64";
- compression = "none";
- load = <CONFIG_SYS_TEXT_BASE>;
-
- uboot_blob: blob-ext {
- filename = "u-boot-nodtb.bin";
- };
- };
-
- atf {
- description = "ARM Trusted Firmware";
- type = "firmware";
- arch = "arm64";
- compression = "none";
- load = <0x920000>;
- entry = <0x920000>;
-
- atf_blob: blob-ext {
- filename = "bl31.bin";
- };
- };
-
- fdt {
- 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 {
- filename = "spl.bin";
- offset = <0x0>;
- };
-
- uboot: blob-ext@2 {
- filename = "u-boot.itb";
- offset = <0x57c00>;
- };
- };
-};
--
2.32.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: Fix binman error
2022-01-07 21:16 [PATCH 1/2] board: phytec: imx8mm-phycore: Remove duplicate binman node Adam Ford
@ 2022-01-07 21:16 ` Adam Ford
2022-01-07 21:24 ` Fabio Estevam
2022-01-08 2:08 ` Tom Rini
2022-01-07 21:23 ` [PATCH 1/2] board: phytec: imx8mm-phycore: Remove duplicate binman node Fabio Estevam
2022-01-08 2:08 ` Tom Rini
2 siblings, 2 replies; 6+ messages in thread
From: Adam Ford @ 2022-01-07 21:16 UTC (permalink / raw)
To: u-boot; +Cc: frieder.schrempf, festevam, trini, t.remmet, Adam Ford
The binman node is part of the imx8mm-u-boot.dtsi file which
is duplicated in imx8mm-kontron-n801x-s-u-boot.dtsi and causes
a build error. Remove the duplicate.
Fixes: 3cbb31f0e848 ("arm64: dts: imx8mm: use common binman configuration")
Signed-off-by: Adam Ford <aford173@gmail.com>
diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi
index 5e368a61bc..22d18e6f1c 100644
--- a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi
+++ b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi
@@ -11,10 +11,6 @@
usb1 = &usbotg2;
};
- binman: binman {
- multiple-images;
- };
-
wdt-reboot {
compatible = "wdt-reboot";
wdt = <&wdog1>;
@@ -130,145 +126,3 @@
&wdog1 {
u-boot,dm-spl;
};
-
-&binman {
- u-boot-spl-ddr {
- filename = "u-boot-spl-ddr.bin";
- pad-byte = <0xff>;
- align-size = <4>;
- align = <4>;
-
- u-boot-spl {
- align-end = <4>;
- };
-
- blob_1: blob-ext@1 {
- filename = "lpddr4_pmu_train_1d_imem.bin";
- size = <0x8000>;
- };
-
- blob_2: blob-ext@2 {
- filename = "lpddr4_pmu_train_1d_dmem.bin";
- size = <0x4000>;
- };
-
- blob_3: blob-ext@3 {
- filename = "lpddr4_pmu_train_2d_imem.bin";
- size = <0x8000>;
- };
-
- blob_4: blob-ext@4 {
- filename = "lpddr4_pmu_train_2d_dmem.bin";
- size = <0x4000>;
- };
- };
-
- spl {
- filename = "spl.bin";
-
- mkimage {
- args = "-n spl/u-boot-spl.cfgout -T imx8mimage -e 0x7e1000";
-
- blob {
- filename = "u-boot-spl-ddr.bin";
- };
- };
- };
-
- itb {
- filename = "u-boot.itb";
-
- fit {
- description = "Configuration to load ATF before U-Boot";
- #address-cells = <1>;
- fit,external-offset = <CONFIG_FIT_EXTERNAL_OFFSET>;
-
- images {
- uboot {
- description = "U-Boot (64-bit)";
- type = "standalone";
- arch = "arm64";
- compression = "none";
- load = <CONFIG_SYS_TEXT_BASE>;
-
- uboot_blob: blob-ext {
- filename = "u-boot-nodtb.bin";
- };
- };
-
- atf {
- description = "ARM Trusted Firmware";
- type = "firmware";
- arch = "arm64";
- compression = "none";
- load = <0x920000>;
- entry = <0x920000>;
-
- atf_blob: blob-ext {
- filename = "bl31.bin";
- };
- };
-
- fdt {
- 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 = <0x57c00>;
- filename = "u-boot.itb";
- };
- };
-
- u-boot-update {
- filename = "firmware-update.itb";
-
- fit {
- description = "Configuration for firmware update file";
-
- images {
- flash-bin {
- description = "U-Boot flash image";
- type = "firmware";
- os = "u-boot";
- arch = "arm";
- compress = "none";
- load = <0>; /* unused */
-
- blob {
- filename = "flash.bin";
- };
-
- };
- };
- };
- };
-};
--
2.32.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] board: phytec: imx8mm-phycore: Remove duplicate binman node
2022-01-07 21:16 [PATCH 1/2] board: phytec: imx8mm-phycore: Remove duplicate binman node Adam Ford
2022-01-07 21:16 ` [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: Fix binman error Adam Ford
@ 2022-01-07 21:23 ` Fabio Estevam
2022-01-08 2:08 ` Tom Rini
2 siblings, 0 replies; 6+ messages in thread
From: Fabio Estevam @ 2022-01-07 21:23 UTC (permalink / raw)
To: Adam Ford; +Cc: U-Boot-Denx, Schrempf Frieder, Tom Rini, Teresa Remmet
On Fri, Jan 7, 2022 at 6:16 PM Adam Ford <aford173@gmail.com> wrote:
>
> The binman node is part of the imx8mm-u-boot.dtsi file which
> is duplicated in phycore-imx8mm-u-boot.dtsi and causes a build
> error. Remove the duplicate.
>
> Fixes: 3cbb31f0e848 ("arm64: dts: imx8mm: use common binman configuration")
> Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: Fix binman error
2022-01-07 21:16 ` [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: Fix binman error Adam Ford
@ 2022-01-07 21:24 ` Fabio Estevam
2022-01-08 2:08 ` Tom Rini
1 sibling, 0 replies; 6+ messages in thread
From: Fabio Estevam @ 2022-01-07 21:24 UTC (permalink / raw)
To: Adam Ford; +Cc: U-Boot-Denx, Schrempf Frieder, Tom Rini, Teresa Remmet
On Fri, Jan 7, 2022 at 6:16 PM Adam Ford <aford173@gmail.com> wrote:
>
> The binman node is part of the imx8mm-u-boot.dtsi file which
> is duplicated in imx8mm-kontron-n801x-s-u-boot.dtsi and causes
> a build error. Remove the duplicate.
>
> Fixes: 3cbb31f0e848 ("arm64: dts: imx8mm: use common binman configuration")
> Signed-off-by: Adam Ford <aford173@gmail.com>
Reviewed-by: Fabio Estevam <festevam@gmail.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] board: phytec: imx8mm-phycore: Remove duplicate binman node
2022-01-07 21:16 [PATCH 1/2] board: phytec: imx8mm-phycore: Remove duplicate binman node Adam Ford
2022-01-07 21:16 ` [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: Fix binman error Adam Ford
2022-01-07 21:23 ` [PATCH 1/2] board: phytec: imx8mm-phycore: Remove duplicate binman node Fabio Estevam
@ 2022-01-08 2:08 ` Tom Rini
2 siblings, 0 replies; 6+ messages in thread
From: Tom Rini @ 2022-01-08 2:08 UTC (permalink / raw)
To: Adam Ford; +Cc: u-boot, frieder.schrempf, festevam, t.remmet
[-- Attachment #1: Type: text/plain, Size: 457 bytes --]
On Fri, Jan 07, 2022 at 03:16:11PM -0600, Adam Ford wrote:
> The binman node is part of the imx8mm-u-boot.dtsi file which
> is duplicated in phycore-imx8mm-u-boot.dtsi and causes a build
> error. Remove the duplicate.
>
> Fixes: 3cbb31f0e848 ("arm64: dts: imx8mm: use common binman configuration")
> Signed-off-by: Adam Ford <aford173@gmail.com>
> Reviewed-by: Fabio Estevam <festevam@gmail.com>
Applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: Fix binman error
2022-01-07 21:16 ` [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: Fix binman error Adam Ford
2022-01-07 21:24 ` Fabio Estevam
@ 2022-01-08 2:08 ` Tom Rini
1 sibling, 0 replies; 6+ messages in thread
From: Tom Rini @ 2022-01-08 2:08 UTC (permalink / raw)
To: Adam Ford; +Cc: u-boot, frieder.schrempf, festevam, t.remmet
[-- Attachment #1: Type: text/plain, Size: 622 bytes --]
On Fri, Jan 07, 2022 at 03:16:12PM -0600, Adam Ford wrote:
> The binman node is part of the imx8mm-u-boot.dtsi file which
> is duplicated in imx8mm-kontron-n801x-s-u-boot.dtsi and causes
> a build error. Remove the duplicate.
>
> Fixes: 3cbb31f0e848 ("arm64: dts: imx8mm: use common binman configuration")
> Reviewed-by: Fabio Estevam <festevam@gmail.com>
> Signed-off-by: Adam Ford <aford173@gmail.com>
>
> diff --git a/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi b/arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi
> index 5e368a61bc..22d18e6f1c 100644
Applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-01-08 2:08 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-07 21:16 [PATCH 1/2] board: phytec: imx8mm-phycore: Remove duplicate binman node Adam Ford
2022-01-07 21:16 ` [PATCH 2/2] imx: imx8mm: imx8mm-kontron-n801x-s: Fix binman error Adam Ford
2022-01-07 21:24 ` Fabio Estevam
2022-01-08 2:08 ` Tom Rini
2022-01-07 21:23 ` [PATCH 1/2] board: phytec: imx8mm-phycore: Remove duplicate binman node Fabio Estevam
2022-01-08 2:08 ` Tom Rini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).