From: Adam Ford <aford173@gmail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH] configs: Convert CONFIG_USE_NAND to CONFIG_NAND
Date: Tue, 10 Jul 2018 06:47:33 -0500 [thread overview]
Message-ID: <20180710114733.5848-1-aford173@gmail.com> (raw)
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>
diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h
index ebfdd1c7a3..6690be60b6 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_NAND_DAVINCI
#define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */
#define CONFIG_ENV_SIZE (128 << 10)
@@ -273,12 +273,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 58624ec581..ee6f866581 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_NAND_DAVINCI
#define CONFIG_ENV_OFFSET 0x0 /* Block 0--not used by bootcode */
#define CONFIG_ENV_SIZE (128 << 9)
@@ -262,12 +261,12 @@
#ifndef CONFIG_DRIVER_TI_EMAC
#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 97e27ae7fe..8ded15c89a 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4418,7 +4418,6 @@ CONFIG_SYS_USE_FLASH
CONFIG_SYS_USE_MAIN_OSCILLATOR
CONFIG_SYS_USE_MMC
CONFIG_SYS_USE_MPC834XSYS_USB_PHY
-CONFIG_SYS_USE_NAND
CONFIG_SYS_USE_NANDFLASH
CONFIG_SYS_USE_NOR
CONFIG_SYS_USE_NORFLASH
--
2.17.1
next reply other threads:[~2018-07-10 11:47 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-10 11:47 Adam Ford [this message]
2018-07-23 14:47 ` [U-Boot] configs: Convert CONFIG_USE_NAND to CONFIG_NAND Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180710114733.5848-1-aford173@gmail.com \
--to=aford173@gmail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.