From: Maxime Ripard <maxime.ripard@bootlin.com>
Date: Mon, 14 May 2018 14:22:47 +0000 (+0200)
Subject: Revert "sunxi: binman: Add U-Boot binary size check"
X-Git-Tag: v2018.07-rc1~8^2~36
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3def2f8dbb4db982bb6f2fa9eca2debe29738325;p=oweals%2Fu-boot.git

Revert "sunxi: binman: Add U-Boot binary size check"

This reverts commit 819f1e081c527d2d02cdaeec0027384688cf5de0.

This check was introduced in order to cope with the size limitation we had
when we were still using the raw environment in MMC. However, this
introduces padding as well, which can result in an overly huge binary if
one wants to flash the environment to some other location.

Since we now have a FAT-based environment, this check is not so useful
anymore, so we can just drop it.

Cc: Andre Przywara <andre.przywara@arm.com>
Cc: Måns Rullgård <mans@mansr.com>
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Reviewed-by: Jagan Teki <jagan@openedev.com>
---

diff --git a/arch/arm/dts/sunxi-u-boot.dtsi b/arch/arm/dts/sunxi-u-boot.dtsi
index 72e95afd78..5adfd9bca2 100644
--- a/arch/arm/dts/sunxi-u-boot.dtsi
+++ b/arch/arm/dts/sunxi-u-boot.dtsi
@@ -1,14 +1,5 @@
 #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))
-
 / {
 	binman {
 		filename = "u-boot-sunxi-with-spl.bin";
@@ -17,9 +8,6 @@
 			filename = "spl/sunxi-spl.bin";
 		};
 		u-boot-img {
-#ifdef CONFIG_MMC
-			size = <UBOOT_MMC_MAX_SIZE>;
-#endif
 			pos = <CONFIG_SPL_PAD_TO>;
 		};
 	};