Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx

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

diff --git a/board/integratorcp/split_by_variant.sh b/board/integratorcp/split_by_variant.sh
index 6e21b7df63b48b798945885b70d12f41b653c4af..3f0a447e447bdff6e6607605d1ceef43883df7ec 100755 (executable)
--- a/board/integratorcp/split_by_variant.sh
+++ b/board/integratorcp/split_by_variant.sh
@@ -3,52 +3,53 @@
 # Set the platform defines
 # ---------------------------------------------------------
 echo -n "/* Integrator configuration implied "   > tmp.fil
-echo    " by Makefile target */"               >> tmp.fil
-echo -n "#define CONFIG_INTEGRATOR"            >> tmp.fil
-echo    " /* Integrator board */"              >> tmp.fil
+echo    " by Makefile target */"               >> tmp.fil
+echo -n "#define CONFIG_INTEGRATOR"            >> tmp.fil
+echo    " /* Integrator board */"              >> tmp.fil
 echo -n "#define CONFIG_ARCH_CINTEGRATOR"      >> tmp.fil
-echo     " 1 /* Integrator/CP   */"            >> tmp.fil
-# ---------------------------------------------------------
-#  Set the core module defines according to Core Module
-# ---------------------------------------------------------
-CC=${CROSS_COMPILE}gcc
+echo     " 1 /* Integrator/CP   */"            >> tmp.fil
+
 cpu="arm_intcm"
+variant="unknown core module"
 
-if [ "$2" == "" ]
+if [ "$1" = "" ]
 then
-       echo "$0:: No preprocessor parameter - using ${CROSS_COMPILE}gcc"
+       echo "$0:: No parameters - using arm_intcm"
 else
-       CC=$2
-fi
+       case "$1" in
+       ap966)
+       cpu="arm_intcm"
+       variant="unported core module CM966E-S"
+       ;;
 
+       ap922_config)
+       cpu="arm_intcm"
+       variant="unported core module CM922T"
+       ;;
 
-if [ "$1" == "" ]
-then
-       echo "$0:: No parameters - using ${CROSS_COMPILE}gcc arm_intcm"
-else
-       case "$1" in
-       cp966_config            |       \
-       cp922_config            |       \
-       cp1026_config           |       \
        integratorcp_config     |       \
        cp_config)
        cpu="arm_intcm"
+       variant="unspecified core module"
        ;;
 
        cp922_XA10_config)
-       echo -n "#define CONFIG_CM922T_XA10"            >> tmp.fil
-       echo    " 1 /* CPU core is ARM922T_XA10 */"     >> tmp.fil
        cpu="arm_intcm"
+       variant="unported core module CM922T_XA10"
+       echo -n "#define CONFIG_CM922T_XA10"            >> tmp.fil
+       echo    " 1 /* CPU core is ARM922T_XA10 */"     >> tmp.fil
        ;;
 
        cp920t_config)
        cpu="arm920t"
-       echo -n "#define CONFIG_CM920T"                 >> tmp.fil
+       variant="Core module CM920T"
+       echo -n "#define CONFIG_CM920T"                 >> tmp.fil
        echo    " 1 /* CPU core is ARM920T */"          >> tmp.fil
        ;;
 
        cp926ejs_config)
        cpu="arm926ejs"
+       variant="Core module CM926EJ-S"
        echo -n "#define CONFIG_CM926EJ_S"              >> tmp.fil
        echo    " 1 /* CPU core is ARM926EJ-S */ "      >> tmp.fil
        ;;
@@ -56,18 +57,21 @@ else
 
        cp946es_config)
        cpu="arm946es"
+       variant="Core module CM946E-S"
        echo -n "#define CONFIG_CM946E_S"               >> tmp.fil
        echo    " 1 /* CPU core is ARM946E-S */ "       >> tmp.fil
        ;;
 
        cp1136_config)
        cpu="arm1136"
+       variant="Core module CM1136EJF-S"
        echo -n "#define CONFIG_CM1136EJF_S"            >> tmp.fil
        echo    " 1 /* CPU core is ARM1136JF-S */ "     >> tmp.fil
        ;;
 
        *)
-       echo "$0:: Unrecognised target - using arm_intcm"
+       echo "$0:: Unknown core module"
+       variant="unknown core module"
        cpu="arm_intcm"
        ;;
 
@@ -75,32 +79,36 @@ else
 
 fi
 
-if [ "$cpu" == "arm_intcm" ]
+if [ "$cpu" = "arm_intcm" ]
 then
        echo "/* Core module undefined/not ported */"   >> tmp.fil
-       echo "#define CONFIG_ARM_INTCM 1"               >> tmp.fil
+       echo "#define CONFIG_ARM_INTCM 1"               >> tmp.fil
        echo -n "#undef CONFIG_CM_MULTIPLE_SSRAM"       >> tmp.fil
-       echo -n "  /* CM may not have "                 >> tmp.fil
-       echo    "multiple SSRAM mapping */"             >> tmp.fil
-       echo -n "#undef CONFIG_CM_SPD_DETECT "          >> tmp.fil
-       echo -n " /* CM may not support SPD "           >> tmp.fil
-       echo    "query */"                              >> tmp.fil
-       echo -n "#undef CONFIG_CM_REMAP  "              >> tmp.fil
-       echo -n " /* CM may not support "               >> tmp.fil
-       echo    "remapping */"                          >> tmp.fil
-       echo -n "#undef CONFIG_CM_INIT  "               >> tmp.fil
-       echo -n " /* CM may not have  "                 >> tmp.fil
-       echo    "initialization reg */"                 >> tmp.fil
-       echo -n "#undef CONFIG_CM_TCRAM  "              >> tmp.fil
-       echo    " /* CM may not have TCRAM */"          >> tmp.fil
+       echo -n "  /* CM may not have "                 >> tmp.fil
+       echo    "multiple SSRAM mapping */"             >> tmp.fil
+       echo -n "#undef CONFIG_CM_SPD_DETECT "          >> tmp.fil
+       echo -n " /* CM may not support SPD "           >> tmp.fil
+       echo    "query */"                              >> tmp.fil
+       echo -n "#undef CONFIG_CM_REMAP  "              >> tmp.fil
+       echo -n " /* CM may not support "               >> tmp.fil
+       echo    "remapping */"                          >> tmp.fil
+       echo -n "#undef CONFIG_CM_INIT  "               >> tmp.fil
+       echo -n " /* CM may not have  "                 >> tmp.fil
+       echo    "initialization reg */"                 >> tmp.fil
+       echo -n "#undef CONFIG_CM_TCRAM  "              >> tmp.fil
+       echo    " /* CM may not have TCRAM */"          >> tmp.fil
 fi
-mv tmp.fil ./include/config.h
+
+mkdir -p ${obj}include
+mkdir -p ${obj}board/integratorcp
+mv tmp.fil ${obj}include/config.h
 # ---------------------------------------------------------
 #  Ensure correct core object loaded first in U-Boot image
 # ---------------------------------------------------------
-$CC -E -P -C -D CPU_FILE=cpu/$cpu/start.o              \
--o board/integratorcp/u-boot.lds board/integratorcp/u-boot.lds.S
+sed -r 's/CPU_FILE/cpu\/'$cpu'\/start.o/; s/#.*//' ${src}board/integratorcp/u-boot.lds.template > ${obj}board/integratorcp/u-boot.lds
 # ---------------------------------------------------------
 # Complete the configuration
 # ---------------------------------------------------------
-./mkconfig -a integratorcp arm $cpu integratorcp;
+$MKCONFIG -a integratorcp arm $cpu integratorcp;
+echo "Variant:: $variant with core $cpu"
+