summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAdam Ford <aford173@gmail.com>2018-07-10 06:47:33 -0500
committerTom Rini <trini@konsulko.com>2018-07-21 22:26:59 -0400
commit8d0d6bc121ef403ae601920ee29d53fa03cfb4b9 (patch)
tree590d76e300c06cb451ece7627dff4b3d1334a8fd /include
parent9d04b5fe16018953720ff01eeb7636d9ec31bb36 (diff)
downloadu-boot-8d0d6bc121ef403ae601920ee29d53fa03cfb4b9.tar.gz
configs: Convert CONFIG_USE_NAND to CONFIG_NAND
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>
Diffstat (limited to 'include')
-rw-r--r--include/configs/da850evm.h6
-rw-r--r--include/configs/omapl138_lcdk.h7
2 files changed, 6 insertions, 7 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)