From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Cc: TsiChung Liew <Tsi-Chung.Liew@nxp.com>
Subject: [PATCH 09/11] Convert CONFIG_NORFLASH_PS32BIT to Kconfig
Date: Thu, 24 Mar 2022 17:18:04 -0400 [thread overview]
Message-ID: <20220324211806.1553189-9-trini@konsulko.com> (raw)
In-Reply-To: <20220324211806.1553189-1-trini@konsulko.com>
This converts the following to Kconfig:
CONFIG_NORFLASH_PS32BIT
Note that we also attempt to correct the behavior of the code here,
which had been testing for "NORFLASH_PS32BIT" which would never be set,
instead check for the now set "CONFIG_NORFLASH_PS32BIT", which results
in some behavior change.
Cc: TsiChung Liew <Tsi-Chung.Liew@nxp.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
board/freescale/m5235evb/Kconfig | 3 +++
configs/M5235EVB_Flash32_defconfig | 2 +-
include/configs/M5235EVB.h | 4 ++--
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/board/freescale/m5235evb/Kconfig b/board/freescale/m5235evb/Kconfig
index fc8341999aa0..f0d4c8c7964d 100644
--- a/board/freescale/m5235evb/Kconfig
+++ b/board/freescale/m5235evb/Kconfig
@@ -12,4 +12,7 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "M5235EVB"
+config NORFLASH_PS32BIT
+ bool "Board has 32bit CFI flash"
+
endif
diff --git a/configs/M5235EVB_Flash32_defconfig b/configs/M5235EVB_Flash32_defconfig
index 8d43b45c4cba..f0077b67a906 100644
--- a/configs/M5235EVB_Flash32_defconfig
+++ b/configs/M5235EVB_Flash32_defconfig
@@ -5,9 +5,9 @@ CONFIG_ENV_SIZE=0x2000
CONFIG_ENV_SECT_SIZE=0x2000
CONFIG_DEFAULT_DEVICE_TREE="M5235EVB_Flash32"
CONFIG_TARGET_M5235EVB=y
+CONFIG_NORFLASH_PS32BIT=y
CONFIG_MCFTMR=y
CONFIG_SYS_LOAD_ADDR=0x20000
-CONFIG_SYS_EXTRA_OPTIONS="NORFLASH_PS32BIT"
CONFIG_BOOTDELAY=1
# CONFIG_DISPLAY_BOARDINFO is not set
# CONFIG_CMDLINE_EDITING is not set
diff --git a/include/configs/M5235EVB.h b/include/configs/M5235EVB.h
index e2f336750d59..625fa01355ec 100644
--- a/include/configs/M5235EVB.h
+++ b/include/configs/M5235EVB.h
@@ -105,7 +105,7 @@
*/
#ifdef CONFIG_SYS_FLASH_CFI
# define CONFIG_SYS_FLASH_SIZE 0x800000 /* Max size that the board might have */
-#ifdef NORFLASH_PS32BIT
+#ifdef CONFIG_NORFLASH_PS32BIT
# define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_32BIT
#else
# define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT
@@ -152,7 +152,7 @@
* CS6 - Available
* CS7 - Available
*/
-#ifdef NORFLASH_PS32BIT
+#ifdef CONFIG_NORFLASH_PS32BIT
# define CONFIG_SYS_CS0_BASE 0xFFC00000
# define CONFIG_SYS_CS0_MASK 0x003f0001
# define CONFIG_SYS_CS0_CTRL 0x00001D00
--
2.25.1
next prev parent reply other threads:[~2022-03-24 21:19 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 ` [PATCH 02/11] M5329EVB, M5373EVB: Remove CONFIG_NANDFLASH_SIZE Tom Rini
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 ` Tom Rini [this message]
2022-03-24 21:18 ` [PATCH 10/11] Convert CONFIG_SYS_MONITOR_BASE to Kconfig 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-9-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