diff options
| author | Tom Rini <[email protected]> | 2021-09-04 15:43:59 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-09-04 15:43:59 -0400 |
| commit | 21b86803ebb1b00cd40487f466905c73722752ac (patch) | |
| tree | bc6e51a4c759f59065d86c25ab0bb110addd28aa /scripts | |
| parent | a48f5ff4f523a59cdf025a4cbafd0cb3a932809f (diff) | |
| parent | 9f6649209f09adcdcec4f194cbca9bdcf9c43bef (diff) | |
Merge branch '2021-09-04-makefile-cleanups-part-b' into next
- Further Makefile/Kconfig namespace cleanups from Simon. This migrates
a number of symbols to Kconfig and replaces some inconsistencies
between CONFIG_FOO and CONFIG_SPL_FOO_SUPPORT/CONFIG_TPL_FOO_SUPPORT.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.spl | 2 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 3 |
2 files changed, 1 insertions, 4 deletions
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)) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 9f8fd151375..6abb18b7aef 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 @@ -1033,11 +1032,9 @@ 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_LTC3676 CONFIG_POWER_LTC3676_I2C_ADDR CONFIG_POWER_MAX77696_I2C_ADDR |