Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86

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

diff --git a/configs/nas220_defconfig b/configs/nas220_defconfig
index 1bd754234d395ebe20a8627f953000ecaa2f15c9..918fd26b05113c951b7758b281affd4e2b1416f3 100644 (file)
--- a/configs/nas220_defconfig
+++ b/configs/nas220_defconfig
@@ -1,7 +1,7 @@
 CONFIG_ARM=y
 CONFIG_SYS_DCACHE_OFF=y
 CONFIG_ARCH_CPU_INIT=y
-CONFIG_KIRKWOOD=y
+CONFIG_ARCH_KIRKWOOD=y
 CONFIG_SYS_TEXT_BASE=0x600000
 CONFIG_TARGET_NAS220=y
 CONFIG_ENV_SIZE=0x10000
@@ -39,6 +39,8 @@ CONFIG_DM=y
 CONFIG_MVSATA_IDE=y
 CONFIG_BLK=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_DM_RTC=y