summaryrefslogtreecommitdiff
path: root/include/configs/mvebu_armada-8k.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-05-09 15:48:09 -0400
committerTom Rini <trini@konsulko.com>2017-05-09 15:48:09 -0400
commita284212963277114ad60e3442d74f095102a9de5 (patch)
treeade5bcb8f4c46b8766d439785ed7d0a210628913 /include/configs/mvebu_armada-8k.h
parente6ceaff1b5f1ff6a0b135fcd931562958e9c91bd (diff)
parente38f5fc8d80d946b401ba0e9ba0fcb52d6e7e74b (diff)
Merge git://www.denx.de/git/u-boot-marvell
Diffstat (limited to 'include/configs/mvebu_armada-8k.h')
-rw-r--r--include/configs/mvebu_armada-8k.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h
index 8ee5f27a97..9d3aeefcd0 100644
--- a/include/configs/mvebu_armada-8k.h
+++ b/include/configs/mvebu_armada-8k.h
@@ -76,11 +76,22 @@
#define CONFIG_ENV_SPI_MODE CONFIG_SF_DEFAULT_MODE
/* Environment in SPI NOR flash */
+#ifdef CONFIG_MVEBU_SPI_BOOT
#define CONFIG_ENV_IS_IN_SPI_FLASH
+/* Environment in NAND flash */
+#elif defined(CONFIG_MVEBU_NAND_BOOT)
+#define CONFIG_ENV_IS_IN_NAND
+#endif
+
#define CONFIG_ENV_OFFSET 0x180000 /* as Marvell U-Boot version */
#define CONFIG_ENV_SIZE (64 << 10) /* 64KiB */
#define CONFIG_ENV_SECT_SIZE (64 << 10) /* 64KiB sectors */
+#define CONFIG_SYS_MAX_NAND_DEVICE 1
+#define CONFIG_SYS_NAND_MAX_CHIPS 1
+#define CONFIG_SYS_NAND_ONFI_DETECTION
+#define CONFIG_SYS_NAND_USE_FLASH_BBT
+
/*
* Ethernet Driver configuration
*/