[U-Boot] [U-Boot,1/2] Convert CONFIG_NAND to Kconfig

[Tom Rini]

On Sat, Mar 09, 2019 at 06:02:51PM -0600, Adam Ford wrote:

> This converts the following to Kconfig:
>        CONFIG_NAND
> 
> A bunch of boards have dependent NAND drivers, and CONFIG_NAND
> is already in Kconfig, so this patch enables that flag for a
> variety of boards to make their respective NAND drivers more
> easily convert to Kconfig
> 
> Signed-off-by: Adam Ford <aford173 at gmail.com>

OK, so there's a problem here again on PowerPC.  Due to how CONFIG_NAND
is used there, we need to migrate a ton of other variables first.  What
happens is that for this patch we need to first do something like:
diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h
index b8fdfc079358..daf137880493 100644
--- a/include/configs/T102xQDS.h
+++ b/include/configs/T102xQDS.h
@@ -39,16 +39,6 @@
 #define CONFIG_SYS_CCSR_DO_NOT_RELOCATE
 #endif
 
-#ifdef CONFIG_NAND
-#define CONFIG_SYS_NAND_U_BOOT_SIZE	(768 << 10)
-#define CONFIG_SYS_NAND_U_BOOT_DST	0x00200000
-#define CONFIG_SYS_NAND_U_BOOT_START	0x00200000
-#define CONFIG_SYS_NAND_U_BOOT_OFFS	(256 << 10)
-#define CONFIG_SYS_LDSCRIPT	"arch/powerpc/cpu/mpc85xx/u-boot-nand.lds"
-#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xqds/t1024_nand_rcw.cfg
-#define CONFIG_SPL_NAND_BOOT
-#endif
-
 #ifdef CONFIG_SPIFLASH
 #define CONFIG_RESET_VECTOR_ADDRESS		0x200FFC
 #define CONFIG_SPL_SPI_FLASH_MINIMAL
@@ -62,9 +52,7 @@
 #endif
 #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xqds/t1024_spi_rcw.cfg
 #define CONFIG_SPL_SPI_BOOT
-#endif
-
-#ifdef CONFIG_SDCARD
+#elif defined(CONFIG_SDCARD)
 #define CONFIG_RESET_VECTOR_ADDRESS		0x200FFC
 #define CONFIG_SYS_MMC_U_BOOT_SIZE	(768 << 10)
 #define CONFIG_SYS_MMC_U_BOOT_DST	(0x00200000)
@@ -76,6 +64,14 @@
 #endif
 #define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xqds/t1024_sd_rcw.cfg
 #define CONFIG_SPL_MMC_BOOT
+#elif defined(CONFIG_NAND)
+#define CONFIG_SYS_NAND_U_BOOT_SIZE	(768 << 10)
+#define CONFIG_SYS_NAND_U_BOOT_DST	0x00200000
+#define CONFIG_SYS_NAND_U_BOOT_START	0x00200000
+#define CONFIG_SYS_NAND_U_BOOT_OFFS	(256 << 10)
+#define CONFIG_SYS_LDSCRIPT	"arch/powerpc/cpu/mpc85xx/u-boot-nand.lds"
+#define CONFIG_SYS_FSL_PBL_RCW board/freescale/t102xqds/t1024_nand_rcw.cfg
+#define CONFIG_SPL_NAND_BOOT
 #endif
 
 #endif /* CONFIG_RAMBOOT_PBL */

But this in turn results in a behavior change.  I'm going to merge,
shortly, the patch I did that migrates CONFIG_QE and related as that
also helps with the CONFIG_NAND patch.  Then I'll give a look at the
patch that migrated more ENV_SIZE/etc stuff (or give that a shot
myself), and cover the other variables shown above.  Then, finally, I
think we can migrate CONFIG_NAND entirely :(  Thanks!

-- 
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/20190525/e56bce40/attachment.sig>