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

[u-boot] / configs / stmark2_defconfig

diff --git a/configs/stmark2_defconfig b/configs/stmark2_defconfig
index 2630865db91b5d95a8e095171476404e05c5c97f..671c0aa4d9c78c897665e61e1e7b54aabb6ad361 100644 (file)
--- a/configs/stmark2_defconfig
+++ b/configs/stmark2_defconfig
@@ -4,21 +4,25 @@ CONFIG_TARGET_STMARK2=y
 CONFIG_SYS_EXTRA_OPTIONS="CF_SBF,SYS_SERIAL_BOOT,SYS_INPUT_CLKSRC=30000000"
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_HUSH_PARSER=y
+# CONFIG_CMDLINE_EDITING is not set
 CONFIG_SYS_PROMPT="stmark2 $ "
 # CONFIG_CMD_BDI is not set
 # CONFIG_CMD_CONSOLE is not set
-# CONFIG_CMD_IMLS is not set
 # CONFIG_CMD_EXPORTENV is not set
 # CONFIG_CMD_IMPORTENV is not set
 # CONFIG_CMD_FLASH is not set
-# CONFIG_CMD_FPGA is not set
 # CONFIG_CMD_LOADS is not set
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
 # CONFIG_CMD_SETEXPR is not set
-# CONFIG_CMD_NET is not set
-# CONFIG_CMD_NFS is not set
 CONFIG_CMD_CACHE=y
+CONFIG_CMD_MTDPARTS=y
+CONFIG_MTDIDS_DEFAULT="nor0=spi-flash.0"
+CONFIG_MTDPARTS_DEFAULT="mtdparts=spi-flash.0:1m(u-boot),7m(kernel),-(rootfs)"
+CONFIG_ENV_IS_IN_SPI_FLASH=y
+# CONFIG_NET is not set
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_MTD=y
+CONFIG_SPI=y
+CONFIG_CF_SPI=y
 CONFIG_REGEX=y