diff options
| -rw-r--r-- | include/configs/da850evm.h | 6 | ||||
| -rw-r--r-- | include/configs/omapl138_lcdk.h | 7 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 1 |
3 files changed, 6 insertions, 8 deletions
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 006cd03c00..973a322769 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -148,7 +148,7 @@ /* * Flash & Environment */ -#ifdef CONFIG_USE_NAND +#ifdef CONFIG_NAND #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_SIZE (128 << 10) #define CONFIG_SYS_NAND_USE_FLASH_BBT @@ -272,12 +272,12 @@ #define CONFIG_CLOCKS #endif -#ifdef CONFIG_USE_NAND +#ifdef CONFIG_NAND #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS #endif -#if !defined(CONFIG_USE_NAND) && \ +#if !defined(CONFIG_NAND) && \ !defined(CONFIG_USE_NOR) && \ !defined(CONFIG_USE_SPIFLASH) #define CONFIG_ENV_SIZE (16 << 10) diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index f34e35e20a..85d6b03749 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -16,7 +16,6 @@ #define CONFIG_DRIVER_TI_EMAC #undef CONFIG_USE_SPIFLASH #undef CONFIG_SYS_USE_NOR -#define CONFIG_USE_NAND /* * Disable DM_* for SPL build and can be re-enabled after adding @@ -142,7 +141,7 @@ /* * Flash & Environment */ -#ifdef CONFIG_USE_NAND +#ifdef CONFIG_NAND #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_SIZE (128 << 9) #define CONFIG_SYS_NAND_USE_FLASH_BBT @@ -258,12 +257,12 @@ #define CONFIG_CLOCKS #endif -#ifdef CONFIG_USE_NAND +#ifdef CONFIG_NAND #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS #endif -#if !defined(CONFIG_USE_NAND) && \ +#if !defined(CONFIG_NAND) && \ !defined(CONFIG_SYS_USE_NOR) && \ !defined(CONFIG_USE_SPIFLASH) #define CONFIG_ENV_SIZE (16 << 10) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index d6d4fb90d7..8e137c7d0a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4675,7 +4675,6 @@ CONFIG_USB_XHCI_KEYSTONE CONFIG_USB_XHCI_OMAP CONFIG_USER_LOWLEVEL_INIT CONFIG_USE_INTERRUPT -CONFIG_USE_NAND CONFIG_USE_NOR CONFIG_USE_ONENAND_BOARD_INIT CONFIG_USE_SPIFLASH |