TX51 pre-release

diff --git a/.cvssymlinks b/.cvssymlinks
index ac22c19fcc53133a199ddeaf30b5d0295fa2f2df..e97979b6970bcef65689852cd45b7c13770e5d44 100644 (file)
--- a/.cvssymlinks
+++ b/.cvssymlinks
@@ -1,9 +1,12 @@
 v1_0 packages/devs/eth/arm/tx25karo/current
 v1_0 packages/devs/eth/arm/tx27karo/current
 v1_0 packages/devs/eth/arm/tx37karo/current
 v1_0 packages/devs/eth/arm/tx25karo/current
 v1_0 packages/devs/eth/arm/tx27karo/current
 v1_0 packages/devs/eth/arm/tx37karo/current

+v1_0 packages/devs/eth/arm/tx51karo/current
+v1_0 packages/devs/ipu/arm/imx/current

 v1_0 packages/hal/arm/mx25/karo/current
 v1_0 packages/hal/arm/mx27/karo/current
 v1_0 packages/hal/arm/mx37/karo/current
 v1_0 packages/hal/arm/mx25/karo/current
 v1_0 packages/hal/arm/mx27/karo/current
 v1_0 packages/hal/arm/mx37/karo/current

+v1_0 packages/hal/arm/mx51/karo/current

 v2_0 packages/compat/linux/current
 v2_0 packages/compat/posix/current
 v2_0 packages/compat/uitron/current
 v2_0 packages/compat/linux/current
 v2_0 packages/compat/posix/current
 v2_0 packages/compat/uitron/current

diff --git a/build.sh b/build.sh
index c667d27bdfe065120f9aa1dd84f95b536365c39b..9363ba525f9e1b87e42d77f299c853bd08ea84fe 100644 (file)
--- a/build.sh
+++ b/build.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash

 options="cnqrR"
 release=false
 tools_dir="$PWD/tools/bin"
 options="cnqrR"
 release=false
 tools_dir="$PWD/tools/bin"


@@ -84,7 +84,7 @@ shift $(($OPTIND - 1))
 if [ $# -gt 0 ];then
     targets="$@"
 else
 if [ $# -gt 0 ];then
     targets="$@"
 else

-    targets=$(cd config; ls *.ecc)
+    targets=$(cd config;ls *.ecc)

 fi
 
 set -e
 fi
 
 set -e


@@ -148,20 +148,20 @@ for target in ${targets};do
 
     if $clean;then
        $quiet || echo "Cleaning up build tree for ${target}"
 
     if $clean;then
        $quiet || echo "Cleaning up build tree for ${target}"

-       make ${make_opts} COMMAND_PREFIX=${cmd_prefix} clean
+       #make ${make_opts} COMMAND_PREFIX=${cmd_prefix} clean
+       make ${make_opts} clean

     fi
 
     $quiet || echo "Compiling ${target}"
     [ -d "${build_dir}" ]
     fi
 
     $quiet || echo "Compiling ${target}"
     [ -d "${build_dir}" ]

-    make -C "${build_dir}" COMMAND_PREFIX=${cmd_prefix} ${make_opts}
+    #make -C "${build_dir}" COMMAND_PREFIX=${cmd_prefix} ${make_opts}
+    make -C "${build_dir}" ${make_opts}

 
     cd $wd
     if $doit && [ -s "${inst_dir}/bin/redboot.elf" ];then
        bootstrap_addr="$(${cmd_prefix}nm "${inst_dir}/bin/redboot.elf" \
            | sed '/Now_in_SDRAM/!d;s/ .*$//')"
 
     cd $wd
     if $doit && [ -s "${inst_dir}/bin/redboot.elf" ];then
        bootstrap_addr="$(${cmd_prefix}nm "${inst_dir}/bin/redboot.elf" \
            | sed '/Now_in_SDRAM/!d;s/ .*$//')"

-       if ! echo "$bootstrap_addr" | grep -i '^[0-9a-f]\{4\}0[0-7]';then
-#      if ! ${cmd_prefix}nm "${inst_dir}/bin/redboot.elf" \
-#          | grep 'Now_in_SDRAM' | grep -i '^[0-9a-f]\{4\}0[0-7]';then
+       if [ -n "$bootstrap_addr" ] && ! echo "$bootstrap_addr" | grep -i '^[0-9a-f]\{4\}0[0-7]';then

            echo "ERROR: Bootstrap does not fit into first NAND page!"
            echo $bootstrap_addr
            exit 1
            echo "ERROR: Bootstrap does not fit into first NAND page!"
            echo $bootstrap_addr
            exit 1