diff mbox series

[U-Boot,V2] Convert CONFIG_CMD_NAND to Kconfig

Message ID 1516759750-20769-1-git-send-email-aford173@gmail.com
State Rejected
Delegated to: Tom Rini
Headers show
Series [U-Boot,V2] Convert CONFIG_CMD_NAND to Kconfig | expand

Commit Message

Adam Ford Jan. 24, 2018, 2:09 a.m. UTC
This converts the following to Kconfig:
   CONFIG_CMD_NAND

Signed-off-by: Adam Ford <aford173@gmail.com>
---
V2:  Remove SUNXI default since this is selected when NAND_SUNXI is
     Since they cannot both recursively check each other.  This was
     causing some trouble.

V1:  Several boards check for the presence of CONFIG_CMD_NAND instead of
     CONFIG_NAND when setting up their NAND parameters.  This will now
     define CONFIG_NAND if CMD_NAND is set.

 cmd/Kconfig                                          | 2 +-
 configs/ls1088aqds_qspi_SECURE_BOOT_defconfig        | 1 +
 configs/ls1088aqds_qspi_defconfig                    | 1 +
 configs/ls1088aqds_sdcard_qspi_defconfig             | 1 +
 configs/ls1088ardb_qspi_SECURE_BOOT_defconfig        | 1 +
 configs/ls1088ardb_qspi_defconfig                    | 1 +
 configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig | 1 +
 configs/ls1088ardb_sdcard_qspi_defconfig             | 1 +
 configs/pfla02_defconfig                             | 1 +
 include/configs/ls1088aqds.h                         | 1 -
 include/configs/ls1088ardb.h                         | 1 -
 include/configs/pfla02.h                             | 1 -
 include/configs/sama5d27_som1_ek.h                   | 1 -
 13 files changed, 9 insertions(+), 5 deletions(-)

Comments

Adam Ford Jan. 24, 2018, 2:50 a.m. UTC | #1
On Tue, Jan 23, 2018 at 8:09 PM, Adam Ford <aford173@gmail.com> wrote:
> This converts the following to Kconfig:
>    CONFIG_CMD_NAND
>
> Signed-off-by: Adam Ford <aford173@gmail.com>
> ---
> V2:  Remove SUNXI default since this is selected when NAND_SUNXI is
>      Since they cannot both recursively check each other.  This was
>      causing some trouble.
>

Sorry for all the noise.  Many of the boards are recursively calling
CMD_NAND from CONFIG_NAND and vice versa, so I'm going to completely
change my approach.  Go ahead and nak this

> V1:  Several boards check for the presence of CONFIG_CMD_NAND instead of
>      CONFIG_NAND when setting up their NAND parameters.  This will now
>      define CONFIG_NAND if CMD_NAND is set.
>
>  cmd/Kconfig                                          | 2 +-
>  configs/ls1088aqds_qspi_SECURE_BOOT_defconfig        | 1 +
>  configs/ls1088aqds_qspi_defconfig                    | 1 +
>  configs/ls1088aqds_sdcard_qspi_defconfig             | 1 +
>  configs/ls1088ardb_qspi_SECURE_BOOT_defconfig        | 1 +
>  configs/ls1088ardb_qspi_defconfig                    | 1 +
>  configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig | 1 +
>  configs/ls1088ardb_sdcard_qspi_defconfig             | 1 +
>  configs/pfla02_defconfig                             | 1 +
>  include/configs/ls1088aqds.h                         | 1 -
>  include/configs/ls1088ardb.h                         | 1 -
>  include/configs/pfla02.h                             | 1 -
>  include/configs/sama5d27_som1_ek.h                   | 1 -
>  13 files changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/cmd/Kconfig b/cmd/Kconfig
> index 35fe9d5..a16cf74 100644
> --- a/cmd/Kconfig
> +++ b/cmd/Kconfig
> @@ -763,7 +763,7 @@ config CMD_MMC
>
>  config CMD_NAND
>         bool "nand"
> -       default y if NAND_SUNXI
> +       select NAND
>         help
>           NAND support.
>
> diff --git a/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig b/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig
> index e464951..28c9029 100644
> --- a/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig
> +++ b/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig
> @@ -12,6 +12,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, QSPI_BOOT"
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_I2C=y
>  CONFIG_CMD_MMC=y
> +CONFIG_CMD_NAND=y
>  CONFIG_CMD_SF=y
>  CONFIG_CMD_USB=y
>  # CONFIG_CMD_SETEXPR is not set
> diff --git a/configs/ls1088aqds_qspi_defconfig b/configs/ls1088aqds_qspi_defconfig
> index 1e368d7..7acd747 100644
> --- a/configs/ls1088aqds_qspi_defconfig
> +++ b/configs/ls1088aqds_qspi_defconfig
> @@ -11,6 +11,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, QSPI_BOOT"
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_I2C=y
>  CONFIG_CMD_MMC=y
> +CONFIG_CMD_NAND=y
>  CONFIG_CMD_SF=y
>  CONFIG_CMD_USB=y
>  # CONFIG_CMD_SETEXPR is not set
> diff --git a/configs/ls1088aqds_sdcard_qspi_defconfig b/configs/ls1088aqds_sdcard_qspi_defconfig
> index 659bc4f..cb8b426 100644
> --- a/configs/ls1088aqds_sdcard_qspi_defconfig
> +++ b/configs/ls1088aqds_sdcard_qspi_defconfig
> @@ -22,6 +22,7 @@ CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
>  CONFIG_HUSH_PARSER=y
>  CONFIG_CMD_I2C=y
>  CONFIG_CMD_MMC=y
> +CONFIG_CMD_NAND=y
>  CONFIG_CMD_SF=y
>  CONFIG_CMD_USB=y
>  # CONFIG_CMD_SETEXPR is not set
> diff --git a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig
> index 19c76b6..5cc652c 100644
> --- a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig
> +++ b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig
> @@ -13,6 +13,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, QSPI_BOOT"
>  # CONFIG_DISPLAY_BOARDINFO is not set
>  CONFIG_CMD_I2C=y
>  CONFIG_CMD_MMC=y
> +CONFIG_CMD_NAND=y
>  CONFIG_CMD_SF=y
>  CONFIG_CMD_USB=y
>  # CONFIG_CMD_SETEXPR is not set
> diff --git a/configs/ls1088ardb_qspi_defconfig b/configs/ls1088ardb_qspi_defconfig
> index 8a08846..62128ed 100644
> --- a/configs/ls1088ardb_qspi_defconfig
> +++ b/configs/ls1088ardb_qspi_defconfig
> @@ -12,6 +12,7 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, QSPI_BOOT"
>  # CONFIG_DISPLAY_BOARDINFO is not set
>  CONFIG_CMD_I2C=y
>  CONFIG_CMD_MMC=y
> +CONFIG_CMD_NAND=y
>  CONFIG_CMD_SF=y
>  CONFIG_CMD_USB=y
>  # CONFIG_CMD_SETEXPR is not set
> diff --git a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
> index a7466f1..ccba0fc 100644
> --- a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
> +++ b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
> @@ -26,6 +26,7 @@ CONFIG_SPL_I2C_SUPPORT=y
>  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
>  CONFIG_CMD_I2C=y
>  CONFIG_CMD_MMC=y
> +CONFIG_CMD_NAND=y
>  CONFIG_CMD_SF=y
>  # CONFIG_CMD_SETEXPR is not set
>  CONFIG_OF_CONTROL=y
> diff --git a/configs/ls1088ardb_sdcard_qspi_defconfig b/configs/ls1088ardb_sdcard_qspi_defconfig
> index 2e3c287..c72992e 100644
> --- a/configs/ls1088ardb_sdcard_qspi_defconfig
> +++ b/configs/ls1088ardb_sdcard_qspi_defconfig
> @@ -23,6 +23,7 @@ CONFIG_SPL_I2C_SUPPORT=y
>  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
>  CONFIG_CMD_I2C=y
>  CONFIG_CMD_MMC=y
> +CONFIG_CMD_NAND=y
>  CONFIG_CMD_SF=y
>  CONFIG_CMD_USB=y
>  # CONFIG_CMD_SETEXPR is not set
> diff --git a/configs/pfla02_defconfig b/configs/pfla02_defconfig
> index 029c9de..59ee623 100644
> --- a/configs/pfla02_defconfig
> +++ b/configs/pfla02_defconfig
> @@ -26,6 +26,7 @@ CONFIG_CMD_BOOTZ=y
>  CONFIG_CMD_GPIO=y
>  CONFIG_CMD_I2C=y
>  CONFIG_CMD_MMC=y
> +CONFIG_CMD_NAND=y
>  CONFIG_CMD_SF=y
>  CONFIG_CMD_DHCP=y
>  CONFIG_CMD_MII=y
> diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
> index 8fbf890..f7d08c1 100644
> --- a/include/configs/ls1088aqds.h
> +++ b/include/configs/ls1088aqds.h
> @@ -156,7 +156,6 @@ unsigned long get_board_ddr_clk(void);
>  #define CONFIG_SYS_NAND_BASE_LIST      { CONFIG_SYS_NAND_BASE }
>  #define CONFIG_SYS_MAX_NAND_DEVICE     1
>  #define CONFIG_MTD_NAND_VERIFY_WRITE
> -#define CONFIG_CMD_NAND
>
>  #define CONFIG_SYS_NAND_BLOCK_SIZE     (128 * 1024)
>
> diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
> index d0066e3..fcc08f5 100644
> --- a/include/configs/ls1088ardb.h
> +++ b/include/configs/ls1088ardb.h
> @@ -142,7 +142,6 @@
>  #define CONFIG_SYS_NAND_BASE_LIST      { CONFIG_SYS_NAND_BASE }
>  #define CONFIG_SYS_MAX_NAND_DEVICE     1
>  #define CONFIG_MTD_NAND_VERIFY_WRITE
> -#define CONFIG_CMD_NAND
>
>  #define CONFIG_SYS_NAND_BLOCK_SIZE     (128 * 1024)
>
> diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h
> index ae03310..9f18519 100644
> --- a/include/configs/pfla02.h
> +++ b/include/configs/pfla02.h
> @@ -54,7 +54,6 @@
>  #define CONFIG_SYS_I2C_SPEED             100000
>
>  #ifndef CONFIG_SPL_BUILD
> -#define CONFIG_CMD_NAND
>  /* Enable NAND support */
>  #define CONFIG_CMD_NAND_TRIMFFS
>  #define CONFIG_NAND_MXS
> diff --git a/include/configs/sama5d27_som1_ek.h b/include/configs/sama5d27_som1_ek.h
> index fdf19ad..3c3ddfe 100644
> --- a/include/configs/sama5d27_som1_ek.h
> +++ b/include/configs/sama5d27_som1_ek.h
> @@ -34,7 +34,6 @@
>  #define CONFIG_SYS_LOAD_ADDR           0x22000000 /* load address */
>
>  /* NAND flash */
> -#undef CONFIG_CMD_NAND
>
>  /* SPI flash */
>  #define CONFIG_SF_DEFAULT_SPEED                66000000
> --
> 2.7.4
>
diff mbox series

Patch

diff --git a/cmd/Kconfig b/cmd/Kconfig
index 35fe9d5..a16cf74 100644
--- a/cmd/Kconfig
+++ b/cmd/Kconfig
@@ -763,7 +763,7 @@  config CMD_MMC
 
 config CMD_NAND
 	bool "nand"
-	default y if NAND_SUNXI
+	select NAND
 	help
 	  NAND support.
 
diff --git a/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig b/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig
index e464951..28c9029 100644
--- a/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig
+++ b/configs/ls1088aqds_qspi_SECURE_BOOT_defconfig
@@ -12,6 +12,7 @@  CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, QSPI_BOOT"
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ls1088aqds_qspi_defconfig b/configs/ls1088aqds_qspi_defconfig
index 1e368d7..7acd747 100644
--- a/configs/ls1088aqds_qspi_defconfig
+++ b/configs/ls1088aqds_qspi_defconfig
@@ -11,6 +11,7 @@  CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, QSPI_BOOT"
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ls1088aqds_sdcard_qspi_defconfig b/configs/ls1088aqds_sdcard_qspi_defconfig
index 659bc4f..cb8b426 100644
--- a/configs/ls1088aqds_sdcard_qspi_defconfig
+++ b/configs/ls1088aqds_sdcard_qspi_defconfig
@@ -22,6 +22,7 @@  CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_HUSH_PARSER=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig
index 19c76b6..5cc652c 100644
--- a/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig
+++ b/configs/ls1088ardb_qspi_SECURE_BOOT_defconfig
@@ -13,6 +13,7 @@  CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, QSPI_BOOT"
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ls1088ardb_qspi_defconfig b/configs/ls1088ardb_qspi_defconfig
index 8a08846..62128ed 100644
--- a/configs/ls1088ardb_qspi_defconfig
+++ b/configs/ls1088ardb_qspi_defconfig
@@ -12,6 +12,7 @@  CONFIG_SYS_EXTRA_OPTIONS="SYS_FSL_DDR4, QSPI_BOOT"
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
index a7466f1..ccba0fc 100644
--- a/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
+++ b/configs/ls1088ardb_sdcard_qspi_SECURE_BOOT_defconfig
@@ -26,6 +26,7 @@  CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_SF=y
 # CONFIG_CMD_SETEXPR is not set
 CONFIG_OF_CONTROL=y
diff --git a/configs/ls1088ardb_sdcard_qspi_defconfig b/configs/ls1088ardb_sdcard_qspi_defconfig
index 2e3c287..c72992e 100644
--- a/configs/ls1088ardb_sdcard_qspi_defconfig
+++ b/configs/ls1088ardb_sdcard_qspi_defconfig
@@ -23,6 +23,7 @@  CONFIG_SPL_I2C_SUPPORT=y
 CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_USB=y
 # CONFIG_CMD_SETEXPR is not set
diff --git a/configs/pfla02_defconfig b/configs/pfla02_defconfig
index 029c9de..59ee623 100644
--- a/configs/pfla02_defconfig
+++ b/configs/pfla02_defconfig
@@ -26,6 +26,7 @@  CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_GPIO=y
 CONFIG_CMD_I2C=y
 CONFIG_CMD_MMC=y
+CONFIG_CMD_NAND=y
 CONFIG_CMD_SF=y
 CONFIG_CMD_DHCP=y
 CONFIG_CMD_MII=y
diff --git a/include/configs/ls1088aqds.h b/include/configs/ls1088aqds.h
index 8fbf890..f7d08c1 100644
--- a/include/configs/ls1088aqds.h
+++ b/include/configs/ls1088aqds.h
@@ -156,7 +156,6 @@  unsigned long get_board_ddr_clk(void);
 #define CONFIG_SYS_NAND_BASE_LIST	{ CONFIG_SYS_NAND_BASE }
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
 #define CONFIG_MTD_NAND_VERIFY_WRITE
-#define CONFIG_CMD_NAND
 
 #define CONFIG_SYS_NAND_BLOCK_SIZE	(128 * 1024)
 
diff --git a/include/configs/ls1088ardb.h b/include/configs/ls1088ardb.h
index d0066e3..fcc08f5 100644
--- a/include/configs/ls1088ardb.h
+++ b/include/configs/ls1088ardb.h
@@ -142,7 +142,6 @@ 
 #define CONFIG_SYS_NAND_BASE_LIST	{ CONFIG_SYS_NAND_BASE }
 #define CONFIG_SYS_MAX_NAND_DEVICE	1
 #define CONFIG_MTD_NAND_VERIFY_WRITE
-#define CONFIG_CMD_NAND
 
 #define CONFIG_SYS_NAND_BLOCK_SIZE	(128 * 1024)
 
diff --git a/include/configs/pfla02.h b/include/configs/pfla02.h
index ae03310..9f18519 100644
--- a/include/configs/pfla02.h
+++ b/include/configs/pfla02.h
@@ -54,7 +54,6 @@ 
 #define CONFIG_SYS_I2C_SPEED		  100000
 
 #ifndef CONFIG_SPL_BUILD
-#define CONFIG_CMD_NAND
 /* Enable NAND support */
 #define CONFIG_CMD_NAND_TRIMFFS
 #define CONFIG_NAND_MXS
diff --git a/include/configs/sama5d27_som1_ek.h b/include/configs/sama5d27_som1_ek.h
index fdf19ad..3c3ddfe 100644
--- a/include/configs/sama5d27_som1_ek.h
+++ b/include/configs/sama5d27_som1_ek.h
@@ -34,7 +34,6 @@ 
 #define CONFIG_SYS_LOAD_ADDR		0x22000000 /* load address */
 
 /* NAND flash */
-#undef CONFIG_CMD_NAND
 
 /* SPI flash */
 #define CONFIG_SF_DEFAULT_SPEED		66000000