scripts/tags.sh: drop SUBARCH support for ARM

Our goal is to have more and more sub-architectures to join the
ARM multi-platform, and support them in a single configuration.

Remove the ARM SUBARCH support because it is ugly.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/scripts/tags.sh b/scripts/tags.sh
index d46be47633af4f0ca38ef3c52170e2b7234a6010..207c854825b400a38a010d68b4ee079686d52560 100755 (executable)
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -42,15 +42,13 @@ find_arch_sources()
        for i in $archincludedir; do
                prune="$prune -wholename $i -prune -o"
        done
-       find ${tree}arch/$1 $ignore $subarchprune $prune -name "$2" \
-               -not -type l -print;
+       find ${tree}arch/$1 $ignore $prune -name "$2" -not -type l -print;
 }
 
 # find sources in arch/$1/include
 find_arch_include_sources()
 {
-       include=$(find ${tree}arch/$1/ $subarchprune \
-                                       -name include -type d -print);
+       include=$(find ${tree}arch/$1/ -name include -type d -print);
        if [ -n "$include" ]; then
                archincludedir="$archincludedir $include"
                find $include $ignore -name "$2" -not -type l -print;
@@ -306,36 +304,6 @@ if [ "${ARCH}" = "um" ]; then
        else
                archinclude=${SUBARCH}
        fi
-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-"${mach_suffix})
-                               ;;
-                       *"plat-"${plat_suffix})
-                               ;;
-                       *)
-                               subarchprune="$subarchprune \
-                                               -wholename $i -prune -o"
-                               ;;
-               esac
-       done
 fi
 
 remove_structs=