Merge tag 'for-master-20181206' of git://git.denx.de/u-boot-rockchip

[oweals/u-boot.git] / configs / silk_defconfig

diff --git a/configs/silk_defconfig b/configs/silk_defconfig
index 34a39a7e72b6d7ef04180c1c7f865002e60da5c9..3350e6903960778efe97f976817d33d11507d641 100644 (file)
--- a/configs/silk_defconfig
+++ b/configs/silk_defconfig
@@ -15,7 +15,6 @@ CONFIG_SPL_SYS_MALLOC_F_LEN=0x2000
 CONFIG_SPL=y
 CONFIG_SPL_SPI_FLASH_SUPPORT=y
 CONFIG_SPL_SPI_SUPPORT=y
-CONFIG_DEFAULT_DEVICE_TREE="r8a7794-silk-u-boot"
 CONFIG_NR_DRAM_BANKS=1
 CONFIG_FIT=y
 CONFIG_BOOTDELAY=3
@@ -52,6 +51,7 @@ CONFIG_MTDIDS_DEFAULT="nor0=spi0.0"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=spi0.0:256k(u-boot-spl),512k(u-boot-env1),512k(u-boot-env2),768k(u-boot),-(user)"
 CONFIG_OF_CONTROL=y
 CONFIG_OF_EMBED=y
+CONFIG_DEFAULT_DEVICE_TREE="r8a7794-silk-u-boot"
 CONFIG_ENV_IS_IN_SPI_FLASH=y
 CONFIG_CLK=y
 CONFIG_CLK_RENESAS=y
@@ -65,7 +65,6 @@ CONFIG_SH_MMCIF=y
 CONFIG_RENESAS_SDHI=y
 CONFIG_MTD=y
 CONFIG_MTD_DEVICE=y
-CONFIG_MTD_PARTITIONS=y
 CONFIG_SPI_FLASH=y
 CONFIG_SPI_FLASH_BAR=y
 CONFIG_SPI_FLASH_SPANSION=y