diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-09 19:48:09 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-09 19:48:09 (GMT) |
| commit | a284212963277114ad60e3442d74f095102a9de5 (patch) | |
| tree | ade5bcb8f4c46b8766d439785ed7d0a210628913 /include/configs | |
| parent | e6ceaff1b5f1ff6a0b135fcd931562958e9c91bd (diff) | |
| parent | e38f5fc8d80d946b401ba0e9ba0fcb52d6e7e74b (diff) | |
| download | u-boot-fsl-qoriq-a284212963277114ad60e3442d74f095102a9de5.tar.xz | |
Merge git://www.denx.de/git/u-boot-marvell
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/db-88f6820-amc.h | 7 | ||||
| -rw-r--r-- | include/configs/mvebu_armada-8k.h | 11 |
2 files changed, 11 insertions, 7 deletions
diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index ba5c090..1cdefa0 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -27,13 +27,6 @@ #define CONFIG_CMD_ENV #define CONFIG_CMD_PCI -/* I2C */ -#define CONFIG_SYS_I2C -#define CONFIG_SYS_I2C_MVTWSI -#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE -#define CONFIG_SYS_I2C_SLAVE 0x0 -#define CONFIG_SYS_I2C_SPEED 100000 - /* SPI NOR flash default params, used by sf commands */ #define CONFIG_SF_DEFAULT_BUS 1 #define CONFIG_SF_DEFAULT_SPEED 1000000 diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index 8ee5f27..9d3aeef 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 */ |