Enable the NAND interface on this board.
Signed-off-by: Chris Packham judge.packham@gmail.com ---
arch/arm/dts/armada-385-amc.dts | 8 ++++++++ configs/db-88f6820-amc_defconfig | 2 ++ include/configs/db-88f6820-amc.h | 4 ++++ 3 files changed, 14 insertions(+)
diff --git a/arch/arm/dts/armada-385-amc.dts b/arch/arm/dts/armada-385-amc.dts index 858138a3376b..a5a8a7f186db 100644 --- a/arch/arm/dts/armada-385-amc.dts +++ b/arch/arm/dts/armada-385-amc.dts @@ -120,6 +120,14 @@ reg = <0>; }; }; + + flash@d0000 { + status = "okay"; + num-cs = <1>; + marvell,nand-keep-config; + marvell,nand-enable-arbiter; + nand-on-flash-bbt; + }; };
pcie-controller { diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig index 74794fed4766..9a6cf4767d92 100644 --- a/configs/db-88f6820-amc_defconfig +++ b/configs/db-88f6820-amc_defconfig @@ -7,6 +7,7 @@ CONFIG_SPL=y CONFIG_BOOTDELAY=3 # CONFIG_CMD_IMLS is not set # CONFIG_CMD_FLASH is not set +CONFIG_CMD_NAND=y CONFIG_CMD_SF=y CONFIG_CMD_SPI=y CONFIG_CMD_I2C=y @@ -23,6 +24,7 @@ CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_SPL_OF_TRANSLATE=y +CONFIG_NAND_PXA3XX=y CONFIG_SPI_FLASH=y CONFIG_SPI_FLASH_BAR=y CONFIG_SPI_FLASH_MACRONIX=y diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index b9cb243e402d..97c51c91d9bb 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -68,6 +68,10 @@ #define CONFIG_PCI_SCAN_SHOW #endif
+/* NAND */ +#define CONFIG_SYS_NAND_USE_FLASH_BBT +#define CONFIG_SYS_NAND_ONFI_DETECTION + #define CONFIG_SYS_CONSOLE_INFO_QUIET /* don't print console @ startup */ #define CONFIG_SYS_ALT_MEMTEST