]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
Merge branch '2022-03-18-Kconfig-migrations' into next
authorTom Rini <trini@konsulko.com>
Fri, 18 Mar 2022 16:48:23 +0000 (12:48 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 18 Mar 2022 16:48:34 +0000 (12:48 -0400)
- A large number of Kconfig migrations.  This also includes a few
  convert-by-enable of DM_ETH on some i.MX platforms.

1  2 
scripts/config_whitelist.txt

index 0b964f68c76d44dc24bd05d1fc1f1633c3c696a7,0b964f68c76d44dc24bd05d1fc1f1633c3c696a7..0107d8f8c2d54281b0f88fc529936d78d7e9fa85
@@@ -1,30 -1,30 +1,11 @@@
--CONFIG_A003399_NOR_WORKAROUND
--CONFIG_A008044_WORKAROUND
--CONFIG_AM335X_USB0
  CONFIG_AM335X_USB0_MODE
--CONFIG_AM335X_USB1
  CONFIG_AM335X_USB1_MODE
--CONFIG_ARMV7_SECURE_BASE
--CONFIG_ARMV7_SECURE_MAX_SIZE
--CONFIG_ARMV7_SECURE_RESERVE_SIZE
--CONFIG_ARMV8_SWITCH_TO_EL1
  CONFIG_ARM_GIC_BASE_ADDRESS
--CONFIG_ARP_TIMEOUT
--CONFIG_AT91SAM9260EK
--CONFIG_AT91SAM9261EK
--CONFIG_AT91SAM9G10
--CONFIG_AT91SAM9G10EK
--CONFIG_AT91SAM9G20EK
--CONFIG_AT91SAM9G20EK_2MMC
--CONFIG_AT91SAM9G45_LCD_BASE
--CONFIG_AT91SAM9M10G45EK
--CONFIG_AT91_GPIO_PULLUP
  CONFIG_AT91_LED
  CONFIG_AT91_WANTS_COMMON_PHY
  CONFIG_ATMEL_LCD
  CONFIG_ATMEL_LCD_BGR555
  CONFIG_ATMEL_LCD_RGB565
--CONFIG_ATMEL_LEGACY
  CONFIG_ATMEL_SPI0
  CONFIG_AUTO_ZRELADDR
  CONFIG_BACKSIDE_L2_CACHE
@@@ -38,9 -38,9 +19,6 @@@ CONFIG_BOOTROM_ERR_RE
  CONFIG_BOOTSCRIPT_ADDR
  CONFIG_BOOTSCRIPT_COPY_RAM
  CONFIG_BOOTSCRIPT_HDR_ADDR
--CONFIG_BOOT_RETRY_MIN
--CONFIG_BOOT_RETRY_TIME
--CONFIG_BPTR_VIRT_ADDR
  CONFIG_BS_ADDR_DEVICE
  CONFIG_BS_ADDR_RAM
  CONFIG_BS_COPY_CMD
@@@ -142,7 -142,7 +120,6 @@@ CONFIG_ESDHC_HC_BLK_ADD
  CONFIG_ESPRESSO7420
  CONFIG_ET1100_BASE
  CONFIG_ETHBASE
--CONFIG_ETHPRIME
  CONFIG_EXTRA_CLOCK
  CONFIG_EXTRA_ENV
  CONFIG_EXTRA_ENV_SETTINGS
@@@ -172,7 -172,7 +149,6 @@@ CONFIG_FDTFIL
  CONFIG_FEC_ENET_DEV
  CONFIG_FEC_FIXED_SPEED
  CONFIG_FEC_MXC_PHYADDR
--CONFIG_FEC_XCV_TYPE
  CONFIG_FIXED_SDHCI_ALIGNED_BUFFER
  CONFIG_FLASH_BR_PRELIM
  CONFIG_FLASH_CFI_LEGACY
@@@ -250,10 -250,10 +226,6 @@@ CONFIG_G_DNL_THOR_PRODUCT_NU
  CONFIG_G_DNL_THOR_VENDOR_NUM
  CONFIG_G_DNL_UMS_PRODUCT_NUM
  CONFIG_G_DNL_UMS_VENDOR_NUM
--CONFIG_HAS_ETH0
--CONFIG_HAS_ETH1
--CONFIG_HAS_ETH2
--CONFIG_HAS_ETH3
  CONFIG_HAS_FSL_DR_USB
  CONFIG_HAS_FSL_MPH_USB
  CONFIG_HDMI_ENCODER_I2C_ADDR
@@@ -567,9 -567,9 +539,7 @@@ CONFIG_NAND_SECBOO
  CONFIG_NAND_SPL
  CONFIG_NETDEV
  CONFIG_NETMASK
--CONFIG_NET_RETRY_COUNT
  CONFIG_NEVER_ASSERT_ODT_TO_CPU
--CONFIG_NFS_TIMEOUT
  CONFIG_NOBQFMAN
  CONFIG_NORBOOT
  CONFIG_NORFLASH_PS32BIT
@@@ -665,7 -665,7 +635,6 @@@ CONFIG_RESERVED_02_BAS
  CONFIG_RESERVED_03_BASE
  CONFIG_RESERVED_04_BASE
  CONFIG_RESET_PHY_R
--CONFIG_RESET_TO_RETRY
  CONFIG_RESET_VECTOR_ADDRESS
  CONFIG_RESTORE_FLASH
  CONFIG_RMII