From: Tom Rini <trini@konsulko.com>
Date: Fri, 8 Jul 2022 21:57:39 +0000 (-0400)
Subject: Merge branch '2022-07-08-Kconfig-migrations' into next
X-Git-Tag: baikal/mips/sdk5.8.2~5^2~292^2
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=c39a05418217fe82a5be910abae067a7b10fd434;p=uboot.git

Merge branch '2022-07-08-Kconfig-migrations' into next

- Another small round of CONFIG migrations to Kconfig
---

c39a05418217fe82a5be910abae067a7b10fd434
diff --cc scripts/config_whitelist.txt
index 0a2b8179d4,000ec0945f..f4ae48d265
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@@ -515,7 -514,7 +514,6 @@@ CONFIG_SYS_CPLD_FTIM
  CONFIG_SYS_CPLD_FTIM2
  CONFIG_SYS_CPLD_FTIM3
  CONFIG_SYS_CPLD_SIZE
--CONFIG_SYS_CPUSPEED
  CONFIG_SYS_CPU_CLK
  CONFIG_SYS_CS0_BASE
  CONFIG_SYS_CS0_CTRL
@@@ -524,7 -523,7 +522,6 @@@ CONFIG_SYS_CS0_FTIM
  CONFIG_SYS_CS0_FTIM2
  CONFIG_SYS_CS0_FTIM3
  CONFIG_SYS_CS0_MASK
--CONFIG_SYS_CS0_SIZE
  CONFIG_SYS_CS1_BASE
  CONFIG_SYS_CS1_CTRL
  CONFIG_SYS_CS1_FTIM0
@@@ -593,12 -592,12 +590,6 @@@ CONFIG_SYS_DA850_DDR2_SDTIMR
  CONFIG_SYS_DA850_PLL0_PLLM
  CONFIG_SYS_DA850_PLL1_PLLM
  CONFIG_SYS_DA850_SYSCFG_SUSPSRC
--CONFIG_SYS_DAVINCI_I2C_SLAVE
--CONFIG_SYS_DAVINCI_I2C_SLAVE1
--CONFIG_SYS_DAVINCI_I2C_SLAVE2
--CONFIG_SYS_DAVINCI_I2C_SPEED
--CONFIG_SYS_DAVINCI_I2C_SPEED1
--CONFIG_SYS_DAVINCI_I2C_SPEED2
  CONFIG_SYS_DCACHE_INV
  CONFIG_SYS_DCSRBAR
  CONFIG_SYS_DCSRBAR_PHYS
@@@ -626,7 -625,7 +617,6 @@@ CONFIG_SYS_DDR_CS0_CONFIG_
  CONFIG_SYS_DDR_CS1_BNDS
  CONFIG_SYS_DDR_CS1_CONFIG
  CONFIG_SYS_DDR_CS1_CONFIG_2
--CONFIG_SYS_DDR_DATA_INIT
  CONFIG_SYS_DDR_INIT_ADDR
  CONFIG_SYS_DDR_INIT_EXT_ADDR
  CONFIG_SYS_DDR_INTERVAL