Merge branch 'master' into next

[platform/kernel/u-boot.git] / include / configs / apollon.h

diff --git a/include/configs/apollon.h b/include/configs/apollon.h
index 925079d..ddac5fb 100644 (file)
--- a/include/configs/apollon.h
+++ b/include/configs/apollon.h
@@ -76,6 +76,7 @@
  * Size of malloc() pool
  */
 #define        CONFIG_ENV_SIZE SZ_128K /* Total Size of Environment Sector */
+#define CONFIG_ENV_SIZE_FLEX SZ_256K
 #define        CONFIG_SYS_MALLOC_LEN   (CONFIG_ENV_SIZE + SZ_1M)
 /* bytes reserved for initial data */
 #define        CONFIG_SYS_GBL_DATA_SIZE        128
@@ -124,6 +125,7 @@
 #define        CONFIG_CMD_JFFS2
 #define        CONFIG_CMD_UBI
 #define        CONFIG_RBTREE
+#define CONFIG_MTD_DEVICE              /* needed for mtdparts commands */
 #define CONFIG_MTD_PARTITIONS
 #endif
 
@@ -254,6 +256,9 @@
 #define CONFIG_SYS_MONITOR_LEN         SZ_256K /* U-Boot image size */
 #define        CONFIG_ENV_IS_IN_ONENAND        1
 #define CONFIG_ENV_ADDR                0x00020000
+#define CONFIG_ENV_ADDR_FLEX   0x00040000
+
+#define CONFIG_SYS_64BIT_VSPRINTF              /* needed for nand_util.c */
 
 #ifdef CONFIG_SYS_USE_UBI
 #define CONFIG_CMD_MTDPARTS