Merge branch '2020-05-15-kconfig-migrations'

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

diff --git a/configs/nsa310s_defconfig b/configs/nsa310s_defconfig
index 404e7ccf1b6f86c10b17bc6b06703292e5a44260..7a864bddf314810b00ede9cac99ae807f0cdb986 100644 (file)
--- a/configs/nsa310s_defconfig
+++ b/configs/nsa310s_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_NSA310S=y
 CONFIG_ENV_SIZE=0x20000
@@ -32,6 +32,8 @@ CONFIG_ENV_IS_IN_NAND=y
 CONFIG_SYS_RELOC_GD_ENV_ADDR=y
 CONFIG_MVSATA_IDE=y
 # CONFIG_MMC is not set
+CONFIG_MTD=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MVGBE=y
 CONFIG_MII=y
 CONFIG_SYS_NS16550=y