diff options
| author | Tom Rini <trini@konsulko.com> | 2019-12-04 17:13:35 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-12-04 17:13:35 -0500 |
| commit | c1c6e4a9da674bce5980d82f8a70a56e023e58c3 (patch) | |
| tree | 46548095b9e4baaa3a7de1d0ce8d07168ad3c01a /include/configs/T102xQDS.h | |
| parent | 94d022bb400890f22fe35220d2519c3bce73f05e (diff) | |
| parent | fb4384490df4e753dcac0478bdb5e912994ef9d6 (diff) | |
| download | u-boot-c1c6e4a9da674bce5980d82f8a70a56e023e58c3.tar.gz | |
Merge branch '2019-10-27-mtd-cleanup'
- Merge the series to clean up our MTD Kconfig and Makefile logic
Diffstat (limited to 'include/configs/T102xQDS.h')
| -rw-r--r-- | include/configs/T102xQDS.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index c6b88c1654..8ac260c2bc 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -39,7 +39,7 @@ #define CONFIG_SYS_CCSR_DO_NOT_RELOCATE #endif -#ifdef CONFIG_NAND +#ifdef CONFIG_MTD_RAW_NAND #define CONFIG_SYS_NAND_U_BOOT_SIZE (768 << 10) #define CONFIG_SYS_NAND_U_BOOT_DST 0x00200000 #define CONFIG_SYS_NAND_U_BOOT_START 0x00200000 @@ -317,7 +317,7 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) -#if defined(CONFIG_NAND) +#if defined(CONFIG_MTD_RAW_NAND) #define CONFIG_SYS_CSPR0_EXT CONFIG_SYS_NAND_CSPR_EXT #define CONFIG_SYS_CSPR0 CONFIG_SYS_NAND_CSPR #define CONFIG_SYS_AMASK0 CONFIG_SYS_NAND_AMASK @@ -632,7 +632,7 @@ unsigned long get_board_ddr_clk(void); */ #define CONFIG_SYS_FMAN_FW_ADDR (512 * 0x820) #define CONFIG_SYS_QE_FW_ADDR (512 * 0x920) -#elif defined(CONFIG_NAND) +#elif defined(CONFIG_MTD_RAW_NAND) #define CONFIG_SYS_FMAN_FW_ADDR (11 * CONFIG_SYS_NAND_BLOCK_SIZE) #define CONFIG_SYS_QE_FW_ADDR (12 * CONFIG_SYS_NAND_BLOCK_SIZE) #elif defined(CONFIG_SRIO_PCIE_BOOT_SLAVE) |