configs: Make NAND_BOOT and ONENAND_BOOT imply NAND

PATCH In review Adam Ford 2 participants 2 messages Jul 8, 2018 – Jul 23, 2018 Arm/Microchip (AT91) SoC support

Share & tools

Adam Ford

author

2018-07-08 12:28 UTC #0 lore raw

PATCH 1/1 configs: Make NAND_BOOT and ONENAND_BOOT imply NAND

Some boards indicate support from booting NAND or ONENAND booting, but don't enable the CONFIG_NAND. This makes those boards imply NAND which will make enabling other flags that are dependent on CONFIG_NAND possible and easier to migrate.

Signed-off-by Adam Ford <[email protected]>

common/Kconfig +2 -0

index 4c7a1a9af8..a22268cbf9 100644
@@ -125,6 +125,7 @@ config NOR_BOOT
 config NAND_BOOT
 	bool "Support for booting from NAND flash"
 	default n
+	imply NAND
 	help
 	  Enabling this will make a U-Boot binary that is capable of being
 	  booted via NAND flash. This is not a must, some SoCs need this,

@@ -133,6 +134,7 @@ config NAND_BOOT
 config ONENAND_BOOT
 	bool "Support for booting from ONENAND"
 	default n
+	imply NAND
 	help
 	  Enabling this will make a U-Boot binary that is capable of being
 	  booted via ONENAND. This is not a must, some SoCs need this,

configs/at91sam9m10g45ek_nandflash_defconfig +0 -1

index d85a92a026..5b5a942f23 100644
@@ -38,7 +38,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_ETH=y
 CONFIG_MACB=y

configs/at91sam9n12ek_nandflash_defconfig +0 -1

index 33da570b4d..1627206c9e 100644
@@ -38,7 +38,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y

configs/at91sam9x5ek_nandflash_defconfig +0 -1

index 5dab4bae88..87944fce47 100644
@@ -39,7 +39,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y

configs/ls2080aqds_nand_defconfig +0 -1

index cbb6133266..c6f91453a8 100644
@@ -41,7 +41,6 @@ CONFIG_NET_RANDOM_ETHADDR=y
 CONFIG_DM=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
-CONFIG_NAND=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_PHYLIB=y
 CONFIG_NETDEVICES=y

configs/ls2080ardb_nand_defconfig +0 -1

index 590d0ba9dd..8a33f4c4d3 100644
@@ -39,7 +39,6 @@ CONFIG_DM=y
 CONFIG_FSL_CAAM=y
 CONFIG_FSL_ESDHC=y
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_PHYLIB=y
 CONFIG_NETDEVICES=y
 CONFIG_PHY_GIGE=y

configs/sama5d2_ptc_ek_nandflash_defconfig +0 -1

index b4a7376197..ebba7599f0 100644
@@ -45,7 +45,6 @@ CONFIG_I2C_EEPROM=y
 CONFIG_DM_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_ATMEL=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_ETH=y
 CONFIG_MACB=y

configs/sama5d36ek_cmp_nandflash_defconfig +0 -1

index 46ec7c728f..9def836578 100644
@@ -40,7 +40,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y

configs/sama5d3_xplained_nandflash_defconfig +0 -1

index 4efcba6062..8d0e475cca 100644
@@ -54,7 +54,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_ETH=y
 CONFIG_MACB=y

configs/sama5d3xek_nandflash_defconfig +0 -1

index b2e46e5bdb..940decc322 100644
@@ -56,7 +56,6 @@ CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
 CONFIG_MTD_NOR_FLASH=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y

configs/sama5d4_xplained_nandflash_defconfig +0 -1

index eae8a04c25..e2f8bbbe49 100644
@@ -52,7 +52,6 @@ CONFIG_SYS_I2C_AT91=y
 CONFIG_I2C_EEPROM=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y

configs/sama5d4ek_nandflash_defconfig +0 -1

index 60fc8add29..1b0be82122 100644
@@ -52,7 +52,6 @@ CONFIG_DM_GPIO=y
 CONFIG_AT91_GPIO=y
 CONFIG_DM_MMC=y
 CONFIG_GENERIC_ATMEL_MCI=y
-CONFIG_NAND=y
 CONFIG_NAND_ATMEL=y
 CONFIG_DM_SPI_FLASH=y
 CONFIG_SPI_FLASH=y

scripts/config_whitelist.txt +0 -2

index 1fb8968ef5..b5f63c834b 100644
@@ -3626,7 +3626,6 @@ CONFIG_SYS_NAND_MAX_OOBFREE
 CONFIG_SYS_NAND_MX7_GPMI_62_ECC_BYTES
 CONFIG_SYS_NAND_NO_SUBPAGE
 CONFIG_SYS_NAND_NO_SUBPAGE_WRITE
-CONFIG_SYS_NAND_ONFI_DETECTION
 CONFIG_SYS_NAND_OR_PRELIM
 CONFIG_SYS_NAND_PAGE_2K
 CONFIG_SYS_NAND_PAGE_4K

@@ -3638,7 +3637,6 @@ CONFIG_SYS_NAND_SELECT_DEVICE
 CONFIG_SYS_NAND_SIZE
 CONFIG_SYS_NAND_SPL_KERNEL_OFFS
 CONFIG_SYS_NAND_SPL_SIZE
-CONFIG_SYS_NAND_USE_FLASH_BBT
 CONFIG_SYS_NAND_U_BOOT_DST
 CONFIG_SYS_NAND_U_BOOT_RELOC
 CONFIG_SYS_NAND_U_BOOT_RELOC_SP

Signature · 1 line

2.17.1

Tom Rini

2018-07-23 14:46 UTC #1 lore raw

common/Kconfig

Quoted 10 lines · Adam Ford

Some boards indicate support from booting NAND or ONENAND booting, but don't enable the CONFIG_NAND. This makes those boards imply NAND which will make enabling other flags that are dependent on CONFIG_NAND possible and easier to migrate.
Signed-off-by Adam Ford <[email protected]>
common/Kconfig +0 -0
index 4c7a1a9af8..a22268cbf9 100644

Applied to u-boot/master, thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180723/c56c7bfe/attachment.sig>