From: Tom Rini Date: Wed, 1 Dec 2021 18:30:59 +0000 (-0500) Subject: Merge branch '2021-12-01-Kconfig-migrations' into next X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=fc47dbb26e9d86a688e69e198b2ed0749db16756;p=u-boot.git Merge branch '2021-12-01-Kconfig-migrations' into next - Finish converting CONFIG_USE_BOOTCOMMAND, CONFIG_BOOTCOMMAND, CONFIG_RAMBOOTCOMMAND, CONFIG_NFSBOOTCOMMAND, all of CONFIG_SYS_[BO]R[0-7]_PRELIM, CONFIG_FSL_DDR_BIST and CONFIG_FSL_DDR_INTERACTIVE. --- fc47dbb26e9d86a688e69e198b2ed0749db16756 diff --cc scripts/config_whitelist.txt index 1e1ef76175,1e1ef76175..50dd3f92e7 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@@ -858,7 -858,7 +858,6 @@@ CONFIG_NETSPACE_V CONFIG_NET_MULTI CONFIG_NET_RETRY_COUNT CONFIG_NEVER_ASSERT_ODT_TO_CPU --CONFIG_NFSBOOTCOMMAND CONFIG_NFS_TIMEOUT CONFIG_NOBQFMAN CONFIG_NON_SECURE @@@ -981,7 -981,7 +980,6 @@@ CONFIG_QBMAN_CLK_DI CONFIG_QIXIS_I2C_ACCESS CONFIG_QSPI CONFIG_QUOTA --CONFIG_RAMBOOTCOMMAND CONFIG_RAMBOOT_NAND CONFIG_RAMBOOT_SPIFLASH CONFIG_RAMBOOT_TEXT_BASE