Merge branch 'master' of git://git.denx.de/u-boot-sunxi

[u-boot] / scripts / build-whitelist.sh

diff --git a/scripts/build-whitelist.sh b/scripts/build-whitelist.sh
index 7cf7a668c16ae7b84a078956bd453df0735d699a..6feb9b67cf59ee068e32cb93d41af290c370f44a 100755 (executable)
--- a/scripts/build-whitelist.sh
+++ b/scripts/build-whitelist.sh
@@ -13,10 +13,10 @@ 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:
 #
-#      SUNXI_GMAC,AHCI,SATAPWR=SUNXI_GPB(8)
+#      SUN7I_GMAC,AHCI,SATAPWR=SUNXI_GPB(8)
 #
 # We want this to produce:
-#      CONFIG_SUNXI_GMAC
+#      CONFIG_SUN7I_GMAC
 #      CONFIG_AHCI
 #      CONFIG_SATAPWR
 #
@@ -39,13 +39,24 @@ git grep CONFIG_ | \
 # Finally, we need a list of the valid Kconfig options to exclude these from
 # the whitelist.
 cat `find . -name "Kconfig*"` |sed -n \
-       -e 's/^config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
-       -e 's/^menuconfig *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
+       -e 's/^\s*config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
+       -e 's/^\s*menuconfig *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
        |sort |uniq >scripts/config_whitelist.txt.tmp2
 
 # Use only the options that are present in the first file but not the second.
 comm -23 scripts/config_whitelist.txt.tmp1 scripts/config_whitelist.txt.tmp2 \
-       |sort |uniq >scripts/config_whitelist.txt
-rm scripts/config_whitelist.txt.tmp1 scripts/config_whitelist.txt.tmp2
+       |sort |uniq >scripts/config_whitelist.txt.tmp3
+
+# If scripts/config_whitelist.txt already exists, take the intersection of the
+# current list and the new one.  We do not want to increase whitelist options.
+if [ -r scripts/config_whitelist.txt ]; then
+       comm -12 scripts/config_whitelist.txt.tmp3 scripts/config_whitelist.txt \
+               > scripts/config_whitelist.txt.tmp4
+       mv scripts/config_whitelist.txt.tmp4 scripts/config_whitelist.txt
+else
+       mv scripts/config_whitelist.txt.tmp3 scripts/config_whitelist.txt
+fi
+
+rm scripts/config_whitelist.txt.tmp*
 
 unset LC_ALL LC_COLLATE