Skip to content

Commit

Permalink
scripts/tags.sh: drop SUBARCH support for ARM
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
masahir0y committed Jul 9, 2019
1 parent 43c78d8 commit d1db881
Showing 1 changed file with 2 additions and 34 deletions.
36 changes: 2 additions & 34 deletions scripts/tags.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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=
Expand Down

0 comments on commit d1db881

Please sign in to comment.