board: phytec: imx8mm-phycore: Remove duplicate binman node

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>

diff --git a/arch/arm/dts/phycore-imx8mm-u-boot.dtsi b/arch/arm/dts/phycore-imx8mm-u-boot.dtsi
index f842e02c771b0804b352baff44587a265bb559da..7c2dfb4a273ca9b5c8ac17d646565b1787a248b2 100644 (file)
--- 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>;
-               };
-       };
-};