summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2021-03-10 13:25:10 -0700
committerCommit Bot <commit-bot@chromium.org>2021-03-11 03:48:00 +0000
commit276b8eb49a231fbdf12ae65fa8a0598df4a06777 (patch)
treed7070456f49874a159f166e5b73cd181317d1dbe
parent49b090edfc5c06d7ac92ca36fc26b6827733e4dc (diff)
downloadchrome-ec-276b8eb49a231fbdf12ae65fa8a0598df4a06777.tar.gz
zephyr: Correct the config check script
This currently looks for CONFIG options in the Kconfig files, but these all have a PLATFORM_EC prefix. Fix this. Also while we are here, combine the two sed expressions for config and menuconfig and don't allow trailing spaces, since these should not be present. BUG=b:181253613 BRANCH=none TEST=cherry-pick Rob's CL http://crrev.com/c/2659282 make BOARD=volteer -j30 See that it doesn't warn about CCD_USBC_PORT_NUMBER anymore Signed-off-by: Simon Glass <sjg@chromium.org> Change-Id: Iddcd4aa7884a9f10a5260aa8e71b4131ba550389 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2749761 Reviewed-by: Denis Brockus <dbrockus@chromium.org>
-rwxr-xr-xutil/check_allowed.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/util/check_allowed.sh b/util/check_allowed.sh
index 5ed6f36df7..5120b69ce2 100755
--- a/util/check_allowed.sh
+++ b/util/check_allowed.sh
@@ -54,9 +54,8 @@ sed -n 's/^\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' "${config}" | sort | uniq \
comm -23 "${new_configs}" "${allow}" > "${suspects}"
# Find all the Kconfig options so far defined
-find "${srctree}" -name "Kconfig*" -exec cat {} \; | sed -n \
- -e 's/^\s*config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
- -e 's/^\s*menuconfig \([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \
+find "${srctree}" -name "Kconfig*" -exec cat {} \; | sed -n -e \
+ 's/^\s*\(config\|menuconfig\) PLATFORM_EC_\([A-Za-z0-9_]*\)$/CONFIG_\2/p' \
| sort | uniq > "${ok}"
# Complain about any new ad-hoc CONFIGs