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

[people/ms/u-boot.git] / include / configs / km / kmp204x-common.h

diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h
index afb22462472e4f7ec7a1ca5d15d9d4c645ae9cd3..0d24f78d4230f68e8b92288230bb7a1e357b8964 100644 (file)
--- a/include/configs/km/kmp204x-common.h
+++ b/include/configs/km/kmp204x-common.h
@@ -15,6 +15,10 @@
 
 #define CONFIG_KM_DEF_NETDEV   "netdev=eth0\0"
 
+/* an additionnal option is required for UBI as subpage access is
+ * supported in u-boot */
+#define CONFIG_KM_UBI_PART_BOOT_OPTS           ",2048"
+
 #define CONFIG_NAND_ECC_BCH
 
 /* common KM defines */
@@ -298,6 +302,7 @@ int get_scl(void);
 #define CONFIG_SPI_FLASH
 #define CONFIG_SPI_FLASH_BAR   /* 4 byte-addressing */
 #define CONFIG_SPI_FLASH_STMICRO
+#define CONFIG_SPI_FLASH_SPANSION
 #define CONFIG_CMD_SF
 #define CONFIG_SF_DEFAULT_SPEED         20000000
 #define CONFIG_SF_DEFAULT_MODE          0
@@ -432,6 +437,7 @@ int get_scl(void);
        "update="                                                       \
                "sf probe 0;sf erase 0 +${filesize};"                   \
                "sf write ${load_addr_r} 0 ${filesize};\0"              \
+       "set_fdthigh=true\0"                                            \
        ""
 
 #define CONFIG_HW_ENV_SETTINGS                                         \