]> git.baikalelectronics.ru Git - uboot.git/commitdiff
Merge branch '2022-03-25-Kconfig-migrations' into next
authorTom Rini <trini@konsulko.com>
Fri, 25 Mar 2022 12:02:04 +0000 (08:02 -0400)
committerTom Rini <trini@konsulko.com>
Fri, 25 Mar 2022 12:02:31 +0000 (08:02 -0400)
- Merge a number of Kconfig migration patches

1  2 
scripts/config_whitelist.txt

index 0107d8f8c2d54281b0f88fc529936d78d7e9fa85,bb8d310b79d3de1e11a931c183c83343e18f380a..88fd64e394a8f942b5e29e69af125f8338854956
@@@ -1,14 -1,14 +1,7 @@@
  CONFIG_AM335X_USB0_MODE
  CONFIG_AM335X_USB1_MODE
  CONFIG_ARM_GIC_BASE_ADDRESS
--CONFIG_AT91_LED
--CONFIG_AT91_WANTS_COMMON_PHY
--CONFIG_ATMEL_LCD
--CONFIG_ATMEL_LCD_BGR555
--CONFIG_ATMEL_LCD_RGB565
--CONFIG_ATMEL_SPI0
  CONFIG_AUTO_ZRELADDR
--CONFIG_BACKSIDE_L2_CACHE
  CONFIG_BCM2835_GPIO
  CONFIG_BITBANGMII_MULTI
  CONFIG_BOARDDIR
@@@ -221,7 -221,7 +214,6 @@@ CONFIG_GATEWAYI
  CONFIG_GLOBAL_TIMER
  CONFIG_GMII
  CONFIG_GREEN_LED
--CONFIG_GURNARD_SPLASH
  CONFIG_G_DNL_THOR_PRODUCT_NUM
  CONFIG_G_DNL_THOR_VENDOR_NUM
  CONFIG_G_DNL_UMS_PRODUCT_NUM
@@@ -453,10 -453,10 +445,6 @@@ CONFIG_L2_CACH
  CONFIG_LAYERSCAPE_NS_ACCESS
  CONFIG_LBA48
  CONFIG_LCD_ALIGNMENT
--CONFIG_LCD_INFO
--CONFIG_LCD_INFO_BELOW_LOGO
--CONFIG_LCD_IN_PSRAM
--CONFIG_LCD_LOGO
  CONFIG_LCD_MENU
  CONFIG_LD9040
  CONFIG_LEGACY
@@@ -464,7 -464,7 +452,6 @@@ CONFIG_LEGACY_BOOTCMD_EN
  CONFIG_LOADS_ECHO
  CONFIG_LOWPOWER_ADDR
  CONFIG_LOWPOWER_FLAG
--CONFIG_LPC32XX_ETH
  CONFIG_LPC32XX_HSUART
  CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY
  CONFIG_LPC32XX_NAND_MLC_NAND_TA
@@@ -582,7 -581,7 +568,6 @@@ CONFIG_PHY_ET1011C_TX_CLK_FI
  CONFIG_PHY_ID
  CONFIG_PHY_INTERFACE_MODE
  CONFIG_PHY_IRAM_BASE
--CONFIG_PHY_RESET_DELAY
  CONFIG_PL011_CLOCK
  CONFIG_PL01x_PORTS
  CONFIG_PM
@@@ -634,10 -633,10 +619,8 @@@ CONFIG_RESERVED_01_BAS
  CONFIG_RESERVED_02_BASE
  CONFIG_RESERVED_03_BASE
  CONFIG_RESERVED_04_BASE
--CONFIG_RESET_PHY_R
  CONFIG_RESET_VECTOR_ADDRESS
  CONFIG_RESTORE_FLASH
--CONFIG_RMII
  CONFIG_ROCKCHIP_CHIP_TAG
  CONFIG_ROCKCHIP_MAX_INIT_SIZE
  CONFIG_ROCKCHIP_SDHCI_MAX_FREQ
@@@ -1767,7 -1765,7 +1749,6 @@@ CONFIG_SYS_RSTC_RMR_VA
  CONFIG_SYS_RTC_BUS_NUM
  CONFIG_SYS_RTC_CNT
  CONFIG_SYS_RTC_SETUP
--CONFIG_SYS_RX_ETH_BUFFER
  CONFIG_SYS_SATA
  CONFIG_SYS_SATA1
  CONFIG_SYS_SATA1_FLAGS
@@@ -1964,7 -1962,7 +1945,6 @@@ CONFIG_TEGRA_VDD_CORE_TPS62361B_SET
  CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1
  CONFIG_TESTPIN_MASK
  CONFIG_TESTPIN_REG
--CONFIG_TFTP_PORT
  CONFIG_THOR_RESET_OFF
  CONFIG_THUNDERX
  CONFIG_TIZEN