Skip to contentSkip to conversation

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

PATCH New Maxime Ripard 2 participants 2 messages May 14, 2018 – May 16, 2018

Subsystems (2)
Arm (32-bit) Arm/Allwinner sunXi SoC support
lore
Share & tools
lore

Maxime Ripard

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
Cc Måns Rullgård <[email protected]>
Signed-off-by Maxime Ripard <[email protected]>
---
 arch/arm/dts/sunxi-u-boot.dtsi | 12 ------------
 1 file changed, 12 deletions(-)
arch/arm/dts/sunxi-u-boot.dtsi +0 -12
index 72e95afd780e..5adfd9bca2ec 100644
@@ -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>;
 		};
 	};
Signature · 1 line
2.17.0
#1 lore raw

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

Quoted 7 lines · Maxime Ripard

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.

Quoted 7 lines

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

Cc Andre Przywara <[email protected]>
Cc Måns Rullgård <[email protected]>
Signed-off-by Maxime Ripard <[email protected]>

---

Applied to u-boot-sunxi/master