From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Cc: TsiChung Liew <Tsi-Chung.Liew@nxp.com>
Subject: [PATCH 02/11] M5329EVB, M5373EVB: Remove CONFIG_NANDFLASH_SIZE
Date: Thu, 24 Mar 2022 17:17:57 -0400 [thread overview]
Message-ID: <20220324211806.1553189-2-trini@konsulko.com> (raw)
In-Reply-To: <20220324211806.1553189-1-trini@konsulko.com>
In the case of M5373EVB we always had NANDFLASH_SIZE=16, so just use it
directly. In the case of M5329EVB we had not removed the rest of NAND
support when saying we didn't have NAND, so instead use that to key off
of rather than NANDFLASH_SIZE.
Cc: TsiChung Liew <Tsi-Chung.Liew@nxp.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
configs/M5329AFEE_defconfig | 3 ---
configs/M5329BFEE_defconfig | 1 -
configs/M5373EVB_defconfig | 1 -
include/configs/M5329EVB.h | 6 +++---
include/configs/M5373EVB.h | 6 +-----
5 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/configs/M5329AFEE_defconfig b/configs/M5329AFEE_defconfig
index 273f1be8bbe1..7dc135ec524e 100644
--- a/configs/M5329AFEE_defconfig
+++ b/configs/M5329AFEE_defconfig
@@ -7,7 +7,6 @@ CONFIG_DEFAULT_DEVICE_TREE="M5329AFEE"
CONFIG_TARGET_M5329EVB=y
CONFIG_MCFTMR=y
CONFIG_SYS_LOAD_ADDR=0x40010000
-CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=0"
CONFIG_BOOTDELAY=1
# CONFIG_DISPLAY_BOARDINFO is not set
# CONFIG_CMDLINE_EDITING is not set
@@ -15,7 +14,6 @@ CONFIG_BOOTDELAY=1
CONFIG_SYS_PROMPT="-> "
CONFIG_CMD_IMLS=y
CONFIG_CMD_I2C=y
-CONFIG_CMD_NAND=y
# CONFIG_CMD_SETEXPR is not set
CONFIG_CMD_MII=y
CONFIG_MII_INIT=y
@@ -37,7 +35,6 @@ CONFIG_MTD_NOR_FLASH=y
CONFIG_FLASH_CFI_DRIVER=y
CONFIG_SYS_FLASH_PROTECTION=y
CONFIG_SYS_FLASH_CFI=y
-CONFIG_MTD_RAW_NAND=y
CONFIG_DM_ETH=y
CONFIG_MCFFEC=y
CONFIG_MII=y
diff --git a/configs/M5329BFEE_defconfig b/configs/M5329BFEE_defconfig
index 8dbfbfcd803b..813baa89eb62 100644
--- a/configs/M5329BFEE_defconfig
+++ b/configs/M5329BFEE_defconfig
@@ -7,7 +7,6 @@ CONFIG_DEFAULT_DEVICE_TREE="M5329BFEE"
CONFIG_TARGET_M5329EVB=y
CONFIG_MCFTMR=y
CONFIG_SYS_LOAD_ADDR=0x40010000
-CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=16"
CONFIG_BOOTDELAY=1
# CONFIG_DISPLAY_BOARDINFO is not set
# CONFIG_CMDLINE_EDITING is not set
diff --git a/configs/M5373EVB_defconfig b/configs/M5373EVB_defconfig
index 61ec8c488e42..3349ea393808 100644
--- a/configs/M5373EVB_defconfig
+++ b/configs/M5373EVB_defconfig
@@ -7,7 +7,6 @@ CONFIG_DEFAULT_DEVICE_TREE="M5373EVB"
CONFIG_TARGET_M5373EVB=y
CONFIG_MCFTMR=y
CONFIG_SYS_LOAD_ADDR=0x40010000
-CONFIG_SYS_EXTRA_OPTIONS="NANDFLASH_SIZE=16"
CONFIG_BOOTDELAY=1
# CONFIG_DISPLAY_BOARDINFO is not set
# CONFIG_CMDLINE_EDITING is not set
diff --git a/include/configs/M5329EVB.h b/include/configs/M5329EVB.h
index cfb2507a7b46..3e5bfc22d0c6 100644
--- a/include/configs/M5329EVB.h
+++ b/include/configs/M5329EVB.h
@@ -113,7 +113,7 @@
# define CONFIG_SYS_MAX_FLASH_SECT 137 /* max number of sectors on one chip */
#endif
-#ifdef CONFIG_NANDFLASH_SIZE
+#ifdef CONFIG_CMD_NAND
# define CONFIG_SYS_MAX_NAND_DEVICE 1
# define CONFIG_SYS_NAND_BASE CONFIG_SYS_CS2_BASE
# define CONFIG_SYS_NAND_SIZE 1
@@ -165,9 +165,9 @@
#define CONFIG_SYS_CS1_MASK 0x001f0001
#define CONFIG_SYS_CS1_CTRL 0x002A3780
-#ifdef CONFIG_NANDFLASH_SIZE
+#ifdef CONFIG_CMD_NAND
#define CONFIG_SYS_CS2_BASE 0x20000000
-#define CONFIG_SYS_CS2_MASK ((CONFIG_NANDFLASH_SIZE << 20) | 1)
+#define CONFIG_SYS_CS2_MASK (16 << 20)
#define CONFIG_SYS_CS2_CTRL 0x00001f60
#endif
diff --git a/include/configs/M5373EVB.h b/include/configs/M5373EVB.h
index 20102a2b9a2a..61e8707dc6bf 100644
--- a/include/configs/M5373EVB.h
+++ b/include/configs/M5373EVB.h
@@ -115,13 +115,11 @@
# define CONFIG_SYS_MAX_FLASH_SECT 137 /* max number of sectors on one chip */
#endif
-#ifdef CONFIG_NANDFLASH_SIZE
# define CONFIG_SYS_MAX_NAND_DEVICE 1
# define CONFIG_SYS_NAND_BASE CONFIG_SYS_CS2_BASE
# define CONFIG_SYS_NAND_SIZE 1
# define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE }
# define NAND_ALLOW_ERASE_ALL 1
-#endif
#define CONFIG_SYS_FLASH_BASE CONFIG_SYS_CS0_BASE
@@ -167,10 +165,8 @@
#define CONFIG_SYS_CS1_MASK 0x001f0001
#define CONFIG_SYS_CS1_CTRL 0x002A3780
-#ifdef CONFIG_NANDFLASH_SIZE
#define CONFIG_SYS_CS2_BASE 0x20000000
-#define CONFIG_SYS_CS2_MASK ((CONFIG_NANDFLASH_SIZE << 20) | 1)
+#define CONFIG_SYS_CS2_MASK (16 << 20)
#define CONFIG_SYS_CS2_CTRL 0x00001f60
-#endif
#endif /* _M5373EVB_H */
--
2.25.1
next prev parent reply other threads:[~2022-03-24 21:18 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-24 21:17 [PATCH 01/11] db-mv784mp-gp: Rename CONFIG_DB_784MP_GP to CONFIG_TARGET_DB_MV784MP_GP Tom Rini
2022-03-24 21:17 ` Tom Rini [this message]
2022-03-24 21:17 ` [PATCH 03/11] Convert CONFIG_DEEP_SLEEP to Kconfig Tom Rini
2022-03-24 21:17 ` [PATCH 04/11] exynos: Drop CONFIG_DEVICE_TREE_LIST Tom Rini
2022-03-25 0:21 ` Jaehoon Chung
2022-03-25 4:41 ` Minkyu Kang
2022-03-24 21:18 ` [PATCH 05/11] mx53loco: Convert CONFIG_DIALOG_POWER to Kconfig Tom Rini
2022-03-24 21:18 ` [PATCH 06/11] Convert CONFIG_E300 et al " Tom Rini
2022-03-24 21:18 ` [PATCH 07/11] Convert CONFIG_SRIO_PCIE_BOOT_SLAVE " Tom Rini
2022-03-24 21:18 ` [PATCH 08/11] at91: Switch to SD_BOOT / CONFIG_NAND_BOOT Tom Rini
2022-03-24 21:18 ` [PATCH 09/11] Convert CONFIG_NORFLASH_PS32BIT to Kconfig Tom Rini
2022-03-24 21:18 ` [PATCH 10/11] Convert CONFIG_SYS_MONITOR_BASE " Tom Rini
2022-03-24 21:18 ` [PATCH 11/11] global: Remove CONFIG_SYS_EXTRA_OPTIONS support Tom Rini
2022-03-28 6:35 ` [PATCH 01/11] db-mv784mp-gp: Rename CONFIG_DB_784MP_GP to CONFIG_TARGET_DB_MV784MP_GP Stefan Roese
2022-04-01 18:45 ` 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=20220324211806.1553189-2-trini@konsulko.com \
--to=trini@konsulko.com \
--cc=Tsi-Chung.Liew@nxp.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox