Merge https://gitlab.denx.de/u-boot/custodians/u-boot-spi

[oweals/u-boot.git] / arch / arm / dts / sunxi-u-boot.dtsi

diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
index 72e95afd780e936e511e92557a7f4c5b51893fa9..fdd4c80aa461458ad4b5363b61b78c1a3907bd58 100644 (file)
--- a/arch/arm/dts/sunxi-u-boot.dtsi
+++ b/arch/arm/dts/sunxi-u-boot.dtsi
@@ -1,15 +1,10 @@
 #include <config.h>
 
-/*
- * This is the maximum size the U-Boot binary can be, which is basically
- * the start of the environment, minus the start of the U-Boot binary in
- * the MMC. This makes the assumption that the MMC is using 512-bytes
- * blocks, but devices using something other than that remains to be
- * seen.
- */
-#define UBOOT_MMC_MAX_SIZE     (CONFIG_ENV_OFFSET - (CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512))
-
 / {
+       aliases {
+               mmc1 = &mmc2;
+       };
+
        binman {
                filename = "u-boot-sunxi-with-spl.bin";
                pad-byte = <0xff>;
@@ -17,10 +12,7 @@
                        filename = "spl/sunxi-spl.bin";
                };
                u-boot-img {
-#ifdef CONFIG_MMC
-                       size = <UBOOT_MMC_MAX_SIZE>;
-#endif
-                       pos = <CONFIG_SPL_PAD_TO>;
+                       offset = <CONFIG_SPL_PAD_TO>;
                };
        };
 };