imx8mm-kontron-n801x-s-u-boot.dtsi: Update for common imx8mm-u-boot.dtsi
Subsystems (2)
PATCH 1/2 imx8mm-kontron-n801x-s-u-boot.dtsi: Update for common imx8mm-u-boot.dtsi
Now that we have the common binman section information included in mx8mm-u-boot.dtsi we must exclude them from the board dts files. Update this to remove the now duplicate information.
---
This is based on having all of
https://patchwork.ozlabs.org/bundle/trini/2022-01-07-imx8-and-binman-updates/
applied which includes
https://patchwork.ozlabs.org/project/uboot/list/?series=268510 and so has the common imx8mm-u-boot.dtsi file in question.
--- .../dts/imx8mm-kontron-n801x-s-u-boot.dtsi | 120 ------------------ 1 file changed, 120 deletions(-)
arch/arm/dts/imx8mm-kontron-n801x-s-u-boot.dtsi +0 -120
@@ -11,10 +11,6 @@ usb1 = &usbotg2; }; - binman: binman { - multiple-images; - }; - wdt-reboot { compatible = "wdt-reboot"; wdt = <&wdog1>;
@@ -132,122 +128,6 @@ }; &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";
Signature · 1 line
2.25.1
PATCH 2/2 phycore-imx8mm-u-boot.dtsi: Update for common imx8mm-u-boot.dtsi
Now that we have the common binman section information included in mx8mm-u-boot.dtsi we must exclude them from the board dts files. Update this to remove the now duplicate information.
---
This is based on having all of
https://patchwork.ozlabs.org/bundle/trini/2022-01-07-imx8-and-binman-updates/
applied which includes
https://patchwork.ozlabs.org/project/uboot/list/?series=268510 and so has the common imx8mm-u-boot.dtsi file in question.
--- arch/arm/dts/phycore-imx8mm-u-boot.dtsi | 122 ------------------------ 1 file changed, 122 deletions(-)
arch/arm/dts/phycore-imx8mm-u-boot.dtsi +0 -122
@@ -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>; - }; - }; -};
Signature · 1 line
2.25.1
Fabio Estevam
reviewerQuoted 5 lines · Tom Rini
Now that we have the common binman section information included in
mx8mm-u-boot.dtsiwe must exclude them from the board dts files. Update this to remove the now duplicate information.
Quoted 8 lines
Cc Frieder Schrempf <[email protected]>Signed-off-by Tom Rini <[email protected]>---
This is based on having all of
https://patchwork.ozlabs.org/bundle/trini/2022-01-07-imx8-and-binman-updates/
applied which includes
https://patchwork.ozlabs.org/project/uboot/list/?series=268510 and so has the commonimx8mm-u-boot.dtsifile in question.
Adam has just submitted these two fixes.
Quoted 15 lines · Fabio Estevam
Quoted 5 lines · Tom Rini
Now that we have the common binman section information included in
mx8mm-u-boot.dtsiwe must exclude them from the board dts files. Update this to remove the now duplicate information.Quoted 8 lines
Cc Frieder Schrempf <[email protected]>Signed-off-by Tom Rini <[email protected]>---
This is based on having all of
https://patchwork.ozlabs.org/bundle/trini/2022-01-07-imx8-and-binman-updates/
applied which includes
https://patchwork.ozlabs.org/project/uboot/list/?series=268510 and so has the commonimx8mm-u-boot.dtsifile in question.
Quoted 1 line
Adam has just submitted these two fixes.
Ah good, I'll grab his versions.
Signature · 1 line
Tom