From: Piotr Dymacz <pepe2k@gmail.com>
Date: Tue, 14 Oct 2014 21:58:10 +0000 (+0200)
Subject: Use U-Boot max. image size definition from top Makefile in configs
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=056fbad307bd67b62e7141f6b5e2ab68752f8972;p=oweals%2Fu-boot_mod.git

Use U-Boot max. image size definition from top Makefile in configs
---

diff --git a/u-boot/Makefile b/u-boot/Makefile
index 302f3e0..5018dc7 100644
--- a/u-boot/Makefile
+++ b/u-boot/Makefile
@@ -289,6 +289,10 @@ ifdef CONFIG_BOOTDELAY
 	@echo "#define CONFIG_BOOTDELAY "$(CONFIG_BOOTDELAY)   >> include/config.h
 endif
 
+ifdef CONFIG_MAX_UBOOT_SIZE_KB
+	@echo "#define CONFIG_MAX_UBOOT_SIZE_KB "$(CONFIG_MAX_UBOOT_SIZE_KB) >> include/config.h
+endif
+
 ifdef CFG_PLL_FREQ
 	@echo "#define CFG_PLL_FREQ "$(CFG_PLL_FREQ)           >> include/config.h
 endif
diff --git a/u-boot/include/configs/ap121.h b/u-boot/include/configs/ap121.h
index 5cc7669..244987c 100644
--- a/u-boot/include/configs/ap121.h
+++ b/u-boot/include/configs/ap121.h
@@ -880,19 +880,16 @@
 
 // U-Boot partition size and offset
 #define WEBFAILSAFE_UPLOAD_UBOOT_ADDRESS				CFG_FLASH_BASE
+#define WEBFAILSAFE_UPLOAD_UBOOT_SIZE_IN_BYTES			(CONFIG_MAX_UBOOT_SIZE_KB * 1024)
 
 #if defined(CONFIG_FOR_DLINK_DIR505_A1)
-	#define WEBFAILSAFE_UPLOAD_UBOOT_SIZE_IN_BYTES		(64 * 1024)
 	#define UPDATE_SCRIPT_UBOOT_SIZE_IN_BYTES			"0x10000"
 #elif defined(CONFIG_FOR_8DEVICES_CARAMBOLA2)
-	#define WEBFAILSAFE_UPLOAD_UBOOT_SIZE_IN_BYTES		(256 * 1024)
 	#define UPDATE_SCRIPT_UBOOT_SIZE_IN_BYTES			"0x40000"
 #elif defined(CONFIG_FOR_DRAGINO_V2) || \
       defined(CONFIG_FOR_MESH_POTATO_V2)
-	#define WEBFAILSAFE_UPLOAD_UBOOT_SIZE_IN_BYTES		(192 * 1024)
 	#define UPDATE_SCRIPT_UBOOT_SIZE_IN_BYTES			"0x30000"
 #else
-	#define WEBFAILSAFE_UPLOAD_UBOOT_SIZE_IN_BYTES		(64 * 1024)
 	#define UPDATE_SCRIPT_UBOOT_SIZE_IN_BYTES			"0x10000"
 #endif
 
diff --git a/u-boot/include/configs/db12x.h b/u-boot/include/configs/db12x.h
index f298a9a..2b2d377 100644
--- a/u-boot/include/configs/db12x.h
+++ b/u-boot/include/configs/db12x.h
@@ -161,7 +161,7 @@
 #define WEBFAILSAFE_UPLOAD_KERNEL_ADDRESS			WEBFAILSAFE_UPLOAD_UBOOT_ADDRESS + 0x20000
 
 // U-Boot partition size
-#define WEBFAILSAFE_UPLOAD_UBOOT_SIZE_IN_BYTES		(64 * 1024)
+#define WEBFAILSAFE_UPLOAD_UBOOT_SIZE_IN_BYTES		(CONFIG_MAX_UBOOT_SIZE_KB * 1024)
 #define UPDATE_SCRIPT_UBOOT_SIZE_IN_BYTES			"0x10000"
 
 // ART partition size