From a7ebc6925b43c9488c421218cbbcb243e6420720 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 8 Aug 2021 12:20:21 -0600 Subject: Convert CONFIG_DMA_LPC32XX to Kconfig This converts the following to Kconfig: CONFIG_DMA_LPC32XX Signed-off-by: Simon Glass --- scripts/config_whitelist.txt | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9f8fd151375..0dbcc165a6d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -223,7 +223,6 @@ CONFIG_DM9000_NO_SROM CONFIG_DM9000_USE_16BIT CONFIG_DMA_COHERENT CONFIG_DMA_COHERENT_SIZE -CONFIG_DMA_LPC32XX CONFIG_DMA_NONCOHERENT CONFIG_DNET_AUTONEG_TIMEOUT CONFIG_DP_DDR_CTRL -- cgit v1.2.3 From 29d7153ec384e072755e8951a8a33f29372f925c Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 8 Aug 2021 12:20:26 -0600 Subject: power: Rename CONFIG_POWER to CONFIG_POWER_LEGACY This option is used in pre-driver model code and much of it has never been converted to driver model. We want to add a new option to enable power support, so we can use a simple rule in the Makefile. Rename this one, which is really about a particular implementation of power. Also update the pmic.h header file so it either includes the legacy API or the driver model one. Signed-off-by: Simon Glass Reviewed-by: Jaehoon Chung --- scripts/config_whitelist.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0dbcc165a6d..50e607f436f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1032,11 +1032,11 @@ CONFIG_POST_EXTERNAL_WORD_FUNCS CONFIG_POST_SKIP_ENV_FLAGS CONFIG_POST_UART CONFIG_POST_WATCHDOG -CONFIG_POWER CONFIG_POWER_FSL CONFIG_POWER_FSL_MC13892 CONFIG_POWER_HI6553 CONFIG_POWER_I2C +CONFIG_POWER_LEGACY CONFIG_POWER_LTC3676 CONFIG_POWER_LTC3676_I2C_ADDR CONFIG_POWER_MAX77696_I2C_ADDR -- cgit v1.2.3 From 9d8665b7091d7d67df7dd31eafe1b54e25f6c3e4 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 8 Aug 2021 12:20:27 -0600 Subject: i2c: Convert CONFIG_POWER_I2C et al to Kconfig This converts the following to Kconfig: CONFIG_POWER_I2C CONFIG_POWER_LEGACY They are handled at the same time due to a dependency between them. Update the Makefile rule to use legacy power only in U-Boot proper. Unfortunately a separate rule is needed in SPL to be able to build legacy power. Add SPL related symbols for both, to allow for SPL-only usage. Signed-off-by: Simon Glass Reviewed-by: Jaehoon Chung [trini: More SPL related cleanups, reword commit message] Signed-off-by: Tom Rini --- scripts/config_whitelist.txt | 2 -- 1 file changed, 2 deletions(-) (limited to 'scripts') diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 50e607f436f..6abb18b7aef 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1035,8 +1035,6 @@ CONFIG_POST_WATCHDOG CONFIG_POWER_FSL CONFIG_POWER_FSL_MC13892 CONFIG_POWER_HI6553 -CONFIG_POWER_I2C -CONFIG_POWER_LEGACY CONFIG_POWER_LTC3676 CONFIG_POWER_LTC3676_I2C_ADDR CONFIG_POWER_MAX77696_I2C_ADDR -- cgit v1.2.3 From 5ed16a9511d735feea74d6b4ea940f5e6b5dd8fc Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 8 Aug 2021 12:20:30 -0600 Subject: net: Rename SPL_NET_SUPPORT to SPL_NET Rename this option so that CONFIG_IS_ENABLED can be used with it. Signed-off-by: Simon Glass --- scripts/Makefile.spl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 25a3e7fa52e..7f8c5f0293d 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -108,7 +108,7 @@ libs-$(CONFIG_SPL_USB_GADGET) += drivers/usb/cdns3/ libs-y += dts/ libs-y += fs/ libs-$(CONFIG_SPL_POST_MEM_SUPPORT) += post/drivers/ -libs-$(CONFIG_SPL_NET_SUPPORT) += net/ +libs-$(CONFIG_SPL_NET) += net/ libs-$(CONFIG_SPL_UNIT_TEST) += test/ head-y := $(addprefix $(obj)/,$(head-y)) -- cgit v1.2.3