Merge with http://www.denx.de/git/u-boot.git

[u-boot] / board / versatile / split_by_variant.sh

diff --git a/board/versatile/split_by_variant.sh b/board/versatile/split_by_variant.sh
index b462b7e1f5f790acc4e6c07dac47779613031daf..576f238adef2f8c895ebe5e7b3aacb6b6ecd39cb 100755 (executable)
--- 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
@@ -42,4 +36,5 @@ fi
 # ---------------------------------------------------------
 # Complete the configuration
 # ---------------------------------------------------------
-./mkconfig -a versatile arm arm926ejs versatile
+./mkconfig -a versatile arm arm926ejs versatile NULL versatile
+echo "Variant:: $variant"