mmc: omap_hsmmc: do not embed struct mmc in struct omap_hsmmc_plat

[people/ms/u-boot.git] / scripts / check-config.sh

diff --git a/scripts/check-config.sh b/scripts/check-config.sh
index 28c8fe98baca39b5af2c3c9ea38a2c7720baa1f9..267758498b3d435d1708e2ac4e10e85b69b2f067 100755 (executable)
--- a/scripts/check-config.sh
+++ b/scripts/check-config.sh
@@ -5,13 +5,8 @@
 # Check that the u-boot.cfg file provided does not introduce any new
 # ad-hoc CONFIG options
 #
-# You can generate the list of current ad-hoc CONFIG options (those which are
-# not in Kconfig) with this command:
-#
-# export LC_ALL=C LC_COLLATE=C
-# git grep CONFIG_ |tr ' \t' '\n\n' |sed -n 's/^\(CONFIG_[A-Z0-9_]*\).*/\1/p' \
-#      |sort |uniq >scripts/config_whitelist.txt;
-# unset LC_ALL LC_COLLATE
+# Use scripts/build-whitelist.sh to generate the list of current ad-hoc
+# CONFIG options (those which are not in Kconfig).
 
 # Usage
 #    check-config.sh <path to u-boot.cfg> <path to whitelist file> <source dir>
@@ -38,16 +33,17 @@ cat ${path} |sed -n 's/^#define \(CONFIG_[A-Za-z0-9_]*\).*/\1/p' |sort |uniq \
 comm -23 ${configs} ${whitelist} > ${suspects}
 
 cat `find ${srctree} -name "Kconfig*"` |sed -n \
-       -e 's/^config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
-       -e 's/^menuconfig \([A-Za-z0-9_]*\).*$/CONFIG_\1/p' |sort |uniq > ${ok}
+       -e 's/^\s*config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
+       -e 's/^\s*menuconfig \([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
+       |sort |uniq > ${ok}
 comm -23 ${suspects} ${ok} >${new_adhoc}
 if [ -s ${new_adhoc} ]; then
-       echo "Error: You must add new CONFIG options using Kconfig"
-       echo "The following new ad-hoc CONFIG options were detected:"
-       cat ${new_adhoc}
-       echo
-       echo "Please add these via Kconfig instead. Find a suitable Kconfig"
-       echo "file and add a 'config' or 'menuconfig' option."
+       echo >&2 "Error: You must add new CONFIG options using Kconfig"
+       echo >&2 "The following new ad-hoc CONFIG options were detected:"
+       cat >&2 ${new_adhoc}
+       echo >&2
+       echo >&2 "Please add these via Kconfig instead. Find a suitable Kconfig"
+       echo >&2 "file and add a 'config' or 'menuconfig' option."
        # Don't delete the temporary files in case they are useful
        exit 1
 else