TX51 pre-release

[karo-tx-redboot.git] / build.sh

diff --git a/build.sh b/build.sh
index e258acc4f290e5163057ff5a93ca4ccfee230e66..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"
@@ -20,7 +20,7 @@ error() {
 
 build_host_tools() {
     echo "Building host tools in $tools_dir"
-
+    # Debian packages tcl-dev and tk-dev are required for this build
     local wd="$PWD"
     local tcldirs="/usr/lib/tcl /usr/local/lib/tcl"
     local config_opts=""
@@ -32,6 +32,7 @@ build_host_tools() {
     done
     if [ -z "$config_opts" ];then
        for d in /usr/lib/tcl*;do
+           [ -d "$d" ] || continue
            config_opts="$config_opts --with-tcl-version=${d##*tcl}"
        done
     fi
@@ -40,6 +41,7 @@ build_host_tools() {
        exit 1
     fi
 
+    export TCL_INC_DIR="$(. /usr/lib/tclConfig.sh; echo $TCL_INCLUDE_SPEC | sed 's/^-I//')"
     mkdir -p "$tools_dir"
     cd "$tools_dir"
     sh ../src/configure $config_opts
@@ -82,7 +84,7 @@ shift $(($OPTIND - 1))
 if [ $# -gt 0 ];then
     targets="$@"
 else
-    targets=$(cd config; ls *.ecc)
+    targets=$(cd config;ls *.ecc)
 fi
 
 set -e
@@ -146,20 +148,20 @@ for target in ${targets};do
 
     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}" ]
-    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/ .*$//')"
-       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