GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-29 10:01:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

configs: Convert CONFIG_USE_NAND to CONFIG_NAND

Browse source 
The DA850-EVM and OMAPL138_LCDK both use checks for CONFIG_USE_NAND.
This patch changes these checks to CONFIG_NAND which is already defined
in Kconfig.  Since the OMAPL138_LCDK already had CONFIG_NAND defined in its
defconfig, it can be deleted from configs/omapl138_lcdk.h.

Signed-off-by: Adam Ford <aford173@gmail.com>
This commit is contained in:
Adam Ford 2018-07-10 06:47:33 -05:00 • committed by Tom Rini
parent 9d04b5fe16
commit 8d0d6bc121
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/configs/da850evm.h
View file

@ -148,7 +148,7 @@
/* /*
* Flash & Environment * Flash & Environment
*/ */
#ifdef CONFIG_USE_NAND #ifdef CONFIG_NAND
#define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */
#define CONFIG_ENV_SIZE (128 << 10) #define CONFIG_ENV_SIZE (128 << 10)
#define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_USE_FLASH_BBT
@ -272,12 +272,12 @@
#define CONFIG_CLOCKS #define CONFIG_CLOCKS
#endif #endif
#ifdef CONFIG_USE_NAND #ifdef CONFIG_NAND
#define CONFIG_MTD_DEVICE #define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS #define CONFIG_MTD_PARTITIONS
#endif #endif
#if !defined(CONFIG_USE_NAND) && \ #if !defined(CONFIG_NAND) && \
!defined(CONFIG_USE_NOR) && \ !defined(CONFIG_USE_NOR) && \
!defined(CONFIG_USE_SPIFLASH) !defined(CONFIG_USE_SPIFLASH)
#define CONFIG_ENV_SIZE (16 << 10) #define CONFIG_ENV_SIZE (16 << 10)

7
include/configs/omapl138_lcdk.h
View file

@ -16,7 +16,6 @@
#define CONFIG_DRIVER_TI_EMAC #define CONFIG_DRIVER_TI_EMAC
#undef CONFIG_USE_SPIFLASH #undef CONFIG_USE_SPIFLASH
#undef CONFIG_SYS_USE_NOR #undef CONFIG_SYS_USE_NOR
#define CONFIG_USE_NAND
/* /*
* Disable DM_* for SPL build and can be re-enabled after adding * Disable DM_* for SPL build and can be re-enabled after adding
@ -142,7 +141,7 @@
/* /*
* Flash & Environment * Flash & Environment
*/ */
#ifdef CONFIG_USE_NAND #ifdef CONFIG_NAND
#define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */ #define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */
#define CONFIG_ENV_SIZE (128 << 9) #define CONFIG_ENV_SIZE (128 << 9)
#define CONFIG_SYS_NAND_USE_FLASH_BBT #define CONFIG_SYS_NAND_USE_FLASH_BBT
@ -258,12 +257,12 @@
#define CONFIG_CLOCKS #define CONFIG_CLOCKS
#endif #endif
#ifdef CONFIG_USE_NAND #ifdef CONFIG_NAND
#define CONFIG_MTD_DEVICE #define CONFIG_MTD_DEVICE
#define CONFIG_MTD_PARTITIONS #define CONFIG_MTD_PARTITIONS
#endif #endif
#if !defined(CONFIG_USE_NAND) && \ #if !defined(CONFIG_NAND) && \
!defined(CONFIG_SYS_USE_NOR) && \ !defined(CONFIG_SYS_USE_NOR) && \
!defined(CONFIG_USE_SPIFLASH) !defined(CONFIG_USE_SPIFLASH)
#define CONFIG_ENV_SIZE (16 << 10) #define CONFIG_ENV_SIZE (16 << 10)

1
scripts/config_whitelist.txt
View file

@ -4675,7 +4675,6 @@ CONFIG_USB_XHCI_KEYSTONE
CONFIG_USB_XHCI_OMAP CONFIG_USB_XHCI_OMAP
CONFIG_USER_LOWLEVEL_INIT CONFIG_USER_LOWLEVEL_INIT
CONFIG_USE_INTERRUPT CONFIG_USE_INTERRUPT
CONFIG_USE_NAND
CONFIG_USE_NOR CONFIG_USE_NOR
CONFIG_USE_ONENAND_BOARD_INIT CONFIG_USE_ONENAND_BOARD_INIT
CONFIG_USE_SPIFLASH CONFIG_USE_SPIFLASH