> 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 <aford...@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: sba...@denx.de
=====================================================================
