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

[oweals/u-boot.git] / include / configs / keymile-common.h

diff --git a/include/configs/keymile-common.h b/include/configs/keymile-common.h
index 58b95f463ab13e3ed50e6a68cf1bd9f3f51bd11b..0cc1b3b59ce4992287081beb951fee4a45ed180c 100644 (file)
--- a/include/configs/keymile-common.h
+++ b/include/configs/keymile-common.h
@@ -45,6 +45,7 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_JFFS2
 #define CONFIG_JFFS2_CMDLINE
+#define CONFIG_CMD_MTDPARTS
 
 #undef CONFIG_WATCHDOG                 /* disable platform specific watchdog */
 
@@ -97,8 +98,7 @@
 #define CONFIG_SYS_SLOT_ID_MASK                (0x3f)  /* mask for slot ID bits */
 
 #define CONFIG_I2C_MULTI_BUS   1
-#define CONFIG_I2C_CMD_TREE    1
-#define CONFIG_SYS_MAX_I2C_BUS         2
+#define CONFIG_SYS_MAX_I2C_BUS         1
 #define CONFIG_SYS_I2C_INIT_BOARD      1
 #define CONFIG_I2C_MUX         1
 
@@ -123,6 +123,20 @@
 #define CONFIG_BOOTP_GATEWAY
 #define CONFIG_BOOTP_HOSTNAME
 
+#define CONFIG_ENV_SIZE                0x04000 /* Size of Environment */
+
+#define CONFIG_SYS_MALLOC_LEN  (1024 * 1024)   /* Reserved for malloc */
+
+#define CONFIG_SYS_64BIT_VSPRINTF      /* needed for UBI/UBIFS */
+
+/* UBI Support for all Keymile boards */
+#define CONFIG_CMD_UBI
+#define CONFIG_RBTREE
+#define CONFIG_MTD_PARTITIONS
+#define CONFIG_FLASH_CFI_MTD
+#define CONFIG_MTD_DEVICE
+#define CONFIG_MTD_CONCAT
+
 /* define this to use the keymile's io muxing feature */
 /*#define CONFIG_IO_MUXING */
 
@@ -240,7 +254,7 @@
                "new_esw_0x${IVM_BoardId}_0x${IVM_HWKey}.scr \0"        \
        "new_esw=run set_new_esw_script; "                              \
                "tftp ${autoscr_ws} ${new_esw_script}; "                \
-               "iminfo ${autoscr_ws}; autoscr ${autoscr_ws} \0"        \
+               "iminfo ${autoscr_ws}; source ${autoscr_ws} \0" \
        "bootlimit=0 \0"                                                \
        CONFIG_KM_DEF_ENV_IOMUX                                         \
        CONFIG_KM_DEF_ENV_PRIVATE                                       \