scripts/tags.sh: handle OMAP platforms properly

When SUBARCH is "omap1" or "omap2", plat-omap/ directory must be
indexed.  Handle this special case properly.

While at it, check if mach- directory exists at all.

Link: http://lkml.kernel.org/r/20161202122148.15001-1-joe.skb7@gmail.com
Signed-off-by: Sam Protsenko <semen.protsenko@linaro.org>
Cc: Michal Marek <mmarek@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/scripts/tags.sh b/scripts/tags.sh
index a2ff3388e5ea396f478870b47e79faadb73cca02..df5fa777d300400a5d050a951af776b848622b35 100755 (executable)
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -304,11 +304,26 @@ if [ "${ARCH}" = "um" ]; then
 elif [ "${SRCARCH}" = "arm" -a "${SUBARCH}" != "" ]; then
        subarchdir=$(find ${tree}arch/$SRCARCH/ -name "mach-*" -type d -o \
                                                        -name "plat-*" -type d);
+       mach_suffix=$SUBARCH
+       plat_suffix=$SUBARCH
+
+       # Special cases when $plat_suffix != $mach_suffix
+       case $mach_suffix in
+               "omap1" | "omap2")
+                       plat_suffix="omap"
+                       ;;
+       esac
+
+       if [ ! -d ${tree}arch/$SRCARCH/mach-$mach_suffix ]; then
+               echo "Warning: arch/arm/mach-$mach_suffix/ not found." >&2
+               echo "         Fix your \$SUBARCH appropriately" >&2
+       fi
+
        for i in $subarchdir; do
                case "$i" in
-                       *"mach-"${SUBARCH})
+                       *"mach-"${mach_suffix})
                                ;;
-                       *"plat-"${SUBARCH})
+                       *"plat-"${plat_suffix})
                                ;;
                        *)
                                subarchprune="$subarchprune \