Cleanup warnings for cpu/arm720t & cpu/arm1136 files.

sed the linker scripts, rather than pre-process them.
Patch by Peter Pearse, 07 Oct 2005

1 files changed, 9 insertions, 14 deletions

diff --git a/board/versatile/split_by_variant.sh b/board/versatile/split_by_variant.sh
index ea705da1c6..35c663e6a5 100755
--- a/board/versatile/split_by_variant.sh
+++ b/board/versatile/split_by_variant.sh
@@ -2,26 +2,17 @@
 # ---------------------------------------------------------
 #  Set the core module defines according to Core Module
 # ---------------------------------------------------------
-CC=${CROSS_COMPILE}gcc
-config="versatilepb_config"
-
-if [ "$2" == "" ]
-then
-	echo "$0:: No preprocessor parameter - using ${CROSS_COMPILE}gcc"
-else
-	CC=$2
-fi
-
-
 # ---------------------------------------------------------
 # Set up the Versatile type define
 # ---------------------------------------------------------
+variant=PB926EJ-S
 if [ "$1" == "" ]
 then
-	echo "$0:: No parameters - using ${CROSS_COMPILE}gcc versatilepb_config"
-
+	echo "$0:: No parameters - using versatilepb_config"
+	echo "#define CONFIG_ARCH_VERSATILE_PB" > ./include/config.h
+	variant=PB926EJ-S
 else
-	case "$config" in
+	case "$1" in
 	versatilepb_config	|	\
 	versatile_config)
 	echo "#define CONFIG_ARCH_VERSATILE_PB" > ./include/config.h
@@ -29,11 +20,14 @@ else
 
 	versatileab_config)
 	echo "#define CONFIG_ARCH_VERSATILE_AB" > ./include/config.h
+	variant=AB926EJ-S
 	;;
 
 
 	*)
 	echo "$0:: Unrecognised config - using versatilepb_config"
+	echo "#define CONFIG_ARCH_VERSATILE_PB" > ./include/config.h
+	variant=PB926EJ-S
 	;;
 
 	esac
@@ -43,3 +37,4 @@ fi
 # Complete the configuration
 # ---------------------------------------------------------
 ./mkconfig -a versatile arm arm926ejs versatile
+echo "Variant:: $variant"