From 5579ce747d1401b7ff8ed90ed616654474d9382b Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 11 Jul 2022 19:04:07 -0600 Subject: Revert "Revert "global: Remove CONFIG_SYS_EXTRA_OPTIONS support"" This is not needed now that CONFIG_SYS_TARGET_NAME is correctly determined when scanning Kconfig. This reverts commit 25b8acee2ea11a9edc100c42a61f5d6187eb6167. Signed-off-by: Simon Glass Suggested-by: Tom Rini Reviewed-by: Tom Rini --- scripts/Makefile.autoconf | 4 ---- scripts/build-whitelist.sh | 23 +++-------------------- 2 files changed, 3 insertions(+), 24 deletions(-) (limited to 'scripts') diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf index 3fa4d50f1ea..5a4a1489553 100644 --- a/scripts/Makefile.autoconf +++ b/scripts/Makefile.autoconf @@ -112,10 +112,6 @@ vpl/include/autoconf.mk: vpl/u-boot.cfg # Prior to Kconfig, it was generated by mkconfig. Now it is created here. define filechk_config_h (echo "/* Automatically generated - do not edit */"; \ - for i in $$(echo $(CONFIG_SYS_EXTRA_OPTIONS) | sed 's/,/ /g'); do \ - echo \#define CONFIG_$$i \ - | sed '/=/ {s/=/ /;q; } ; { s/$$/ 1/; }'; \ - done; \ echo \#define CONFIG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\ echo \#include \; \ echo \#include \; \ diff --git a/scripts/build-whitelist.sh b/scripts/build-whitelist.sh index 6feb9b67cf5..37630c0271c 100755 --- a/scripts/build-whitelist.sh +++ b/scripts/build-whitelist.sh @@ -10,30 +10,13 @@ # export LC_ALL=C LC_COLLATE=C -# There are two independent greps. The first pulls out the component parts -# of CONFIG_SYS_EXTRA_OPTIONS. An example is: +# Looks for the rest of the CONFIG options, but exclude those in Kconfig and +# defconfig files. # -# SUN7I_GMAC,AHCI,SATAPWR=SUNXI_GPB(8) -# -# We want this to produce: -# CONFIG_SUN7I_GMAC -# CONFIG_AHCI -# CONFIG_SATAPWR -# -# The second looks for the rest of the CONFIG options, but excludes those in -# Kconfig and defconfig files. -# -( -git grep CONFIG_SYS_EXTRA_OPTIONS |sed -n \ - 's/.*CONFIG_SYS_EXTRA_OPTIONS="\(.*\)"/\1/ p' \ - | tr , '\n' \ - | sed 's/ *\([A-Za-z0-9_]*\).*/CONFIG_\1/' - git grep CONFIG_ | \ egrep -vi "(Kconfig:|defconfig:|README|\.py|\.pl:)" \ | tr ' \t' '\n\n' \ - | sed -n 's/^\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' -) \ + | sed -n 's/^\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' \ |sort |uniq >scripts/config_whitelist.txt.tmp1; # Finally, we need a list of the valid Kconfig options to exclude these from -- cgit v1.2.3 From 811c8e17117880badf0ea218dda44c06a3e02a2e Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 11 Jul 2022 19:04:10 -0600 Subject: Drop genboardscfg.py Now that buildman can generate this with the -R option, drop the script. Signed-off-by: Simon Glass Suggested-by: Tom Rini --- scripts/pylint.base | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/pylint.base b/scripts/pylint.base index 9ebebf47ab9..dd6360e6256 100644 --- a/scripts/pylint.base +++ b/scripts/pylint.base @@ -201,7 +201,6 @@ tools_dtoc_test_fdt 6.88 tools_dtoc_test_src_scan 9.43 tools_efivar 6.71 tools_endian-swap 9.29 -tools_genboardscfg 7.95 tools_microcode-tool 7.25 tools_moveconfig 8.34 tools_patman___init__ 0.00 -- cgit v1.2.3