Merge branch 'master' of git://git.denx.de/u-boot-blackfin

diff --git a/include/configs/bct-brettl2.h b/include/configs/bct-brettl2.h
index 39982ef72cf1c6fc25a6d24c96f178da8d624700..2e0e9224cfa04407a00b0275bea5fef431694076 100644 (file)
--- a/include/configs/bct-brettl2.h
+++ b/include/configs/bct-brettl2.h
@@ -97,7 +97,7 @@
 #define CONFIG_ENV_IS_IN_FLASH 1
 #define CONFIG_ENV_OFFSET      0x4000
 #define CONFIG_ENV_SIZE                0x2000
-#define CONFIG_ENV_SECT_SIZE   0x10000
+#define CONFIG_ENV_SECT_SIZE   0x12000
 
 #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS)
 #define ENV_IS_EMBEDDED

diff --git a/include/configs/ibf-dsp561.h b/include/configs/ibf-dsp561.h
index ac5ca9af37b839385a891f03aa3f86f066f5993f..2a937c6a2212fea8565261a919163a20222a9d40 100644 (file)
--- a/include/configs/ibf-dsp561.h
+++ b/include/configs/ibf-dsp561.h
@@ -82,7 +82,7 @@
 #define CONFIG_ENV_OFFSET              0x4000
 #define CONFIG_ENV_ADDR                (CONFIG_SYS_FLASH_BASE + CONFIG_ENV_OFFSET)
 #define CONFIG_ENV_SIZE                0x2000
-#define CONFIG_ENV_SECT_SIZE   0x10000 /* Total Size of Environment Sector */
+#define CONFIG_ENV_SECT_SIZE   0x12000 /* Total Size of Environment Sector */
 #if (CONFIG_BFIN_BOOT_MODE == BFIN_BOOT_BYPASS)
 #define ENV_IS_EMBEDDED
 #else

diff --git a/include/configs/ip04.h b/include/configs/ip04.h
index ec510bdac421757a54086fc1e6892ca166d31212..2ee215f70614dfb44b7179e8247dc2936329e768 100644 (file)
--- a/include/configs/ip04.h
+++ b/include/configs/ip04.h
@@ -61,7 +61,7 @@
 #define CONFIG_EBIU_AMBCTL0_VAL        0xffc2ffc2
 #define CONFIG_EBIU_AMBCTL1_VAL        0xffc2ffc2
 
-#define CONFIG_SYS_MONITOR_LEN         (256 * 1024)
+#define CONFIG_SYS_MONITOR_LEN         (384 * 1024)
 #define CONFIG_SYS_MALLOC_LEN          (128 * 1024)