Merge "ipq6018: Disable SPI NAND"

This commit is contained in:
Linux Build Service Account 2019-05-14 23:35:36 -07:00 committed by Gerrit - the friendly Code Review server
commit dc46d0fd8b

View file

@ -219,13 +219,18 @@ extern loff_t board_env_size;
/*
* SPI NAND SUPPORT
*/
#define CONFIG_IPQ6018_SPI_NAND
#undef CONFIG_IPQ6018_SPI_NAND
#ifdef CONFIG_IPQ6018_SPI_NAND
#define CONFIG_SPI_NAND
#define CONFIG_SF_SPI_NAND_CS 1
#define CONFIG_IPQ_SPI_NAND_INFO_IDX 1
#define CONFIG_SF_NAND_BUS 1
#define CONFIG_SPI_NAND_MULTI_BYTE_READ_ID
#define CONFIG_IPQ_MAX_SPI_DEVICE 2
#define CONFIG_IPQ_SPI_NOR_INFO_IDX 2
#else
#define CONFIG_IPQ_MAX_SPI_DEVICE 1
#define CONFIG_IPQ_SPI_NOR_INFO_IDX 1
#endif
/*
@ -236,10 +241,8 @@ extern loff_t board_env_size;
CONFIG_IPQ_MAX_SPI_DEVICE
#define CONFIG_IPQ_MAX_NAND_DEVICE 1
#define CONFIG_IPQ_MAX_SPI_DEVICE 2
#define CONFIG_QPIC_NAND_NAND_INFO_IDX 0
#define CONFIG_IPQ_SPI_NOR_INFO_IDX 2
#define CONFIG_NAND_FLASH_INFO_IDX CONFIG_QPIC_NAND_NAND_INFO_IDX
#define CONFIG_SPI_FLASH_INFO_IDX CONFIG_IPQ_SPI_NOR_INFO_IDX