sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix OS X crossbuilds for arm

Browse source 
- Fixed missing variable interpolation because of single quotes
 - Replaced /bin/sh in gen_uEnv.txt.sh with /usr/bin/env bash as the default
   echo doesn't support '-n'
 - Fixed some whitespace errors
 - A succesful build requires for now to skip the gold linker on OSX.

Change-Id: Id09bf52f45252026e3a58b74e8448ea24a0dab12
This commit is contained in:
Lionel Sambuc 2014-10-10 11:19:08 +02:00
parent eda6f5931d
commit ce3cb94487
2 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
releasetools/arm_sdimage.sh
View file

@ -79,7 +79,7 @@ HOME_START=$(($USR_START + $USR_SIZE))
case $(uname -s) in case $(uname -s) in
Darwin) Darwin)
MKFS_VFAT_CMD=newfs_msdos MKFS_VFAT_CMD=newfs_msdos
MKFS_VFAT_OPTS='-h 64 -u 32 -S 512 -s ${FAT_SIZE} -o 0' MKFS_VFAT_OPTS="-h 64 -u 32 -S 512 -s ${FAT_SIZE} -o 0"
;; ;;
FreeBSD) FreeBSD)
MKFS_VFAT_CMD=newfs_msdos MKFS_VFAT_CMD=newfs_msdos

42
releasetools/gen_uEnv.txt.sh
View file

@ -1,4 +1,4 @@
#!/bin/sh #!/usr/bin/env bash
#generate a u-boot u-env. #generate a u-boot u-env.
list="0x80200000 kernel.bin list="0x80200000 kernel.bin
@ -22,34 +22,34 @@ NETBOOT="no"
BOOT="mmcbootcmd" BOOT="mmcbootcmd"
#default for the beagleboard-xM #default for the beagleboard-xM
CONSOLE=tty02 CONSOLE=tty02
#verbosity #verbosity
VERBOSE=0 VERBOSE=0
HZ=1000 HZ=1000
while getopts "c:v:h:p:n?" c while getopts "c:v:h:p:n?" c
do do
case "$c" in case "$c" in
\?) \?)
echo "Usage: $0 [-p netboot_prefix] -n [-c consoletty] [-v level] " >&2 echo "Usage: $0 [-p netboot_prefix] -n [-c consoletty] [-v level] " >&2
exit 1 exit 1
;; ;;
n) n)
# genrate netbooting uEnv.txt # genrate netbooting uEnv.txt
BOOT="netbootcmd" BOOT="netbootcmd"
NETBOOT="yes" NETBOOT="yes"
;; ;;
p) p)
NETBOOT_PREFIX=$OPTARG NETBOOT_PREFIX=$OPTARG
;; ;;
c) c)
CONSOLE=$OPTARG CONSOLE=$OPTARG
;; ;;
v) v)
VERBOSE=$OPTARG VERBOSE=$OPTARG
;; ;;
h) h)
# system hz # system hz
HZ=$OPTARG HZ=$OPTARG
;; ;;
esac esac
@ -60,7 +60,7 @@ fill_cmd() {
#prefix is an optional directory containing the ending / #prefix is an optional directory containing the ending /
load=$1 load=$1
prefix=$2 prefix=$2
export IFS=" " export IFS=" "
echo $list | while true echo $list | while true
do do
if ! read -r mem addr if ! read -r mem addr
@ -78,9 +78,9 @@ echo "uenvcmd=run $BOOT"
echo "bootargs=console=$CONSOLE rootdevname=c0d0p1 verbose=$VERBOSE hz=$HZ" echo "bootargs=console=$CONSOLE rootdevname=c0d0p1 verbose=$VERBOSE hz=$HZ"
echo echo
echo 'bootminix=setenv bootargs \$bootargs board_name=\$board_name ; echo \$bootargs; go 0x80200000 \\\"$bootargs\\\"' echo 'bootminix=setenv bootargs \$bootargs board_name=\$board_name ; echo \$bootargs; go 0x80200000 \\\"$bootargs\\\"'
echo echo
echo "mmcbootcmd=echo starting from MMC ; mmc part 0; $(fill_cmd "fatload mmc 0:1" "") ; run bootminix" echo "mmcbootcmd=echo starting from MMC ; mmc part 0; $(fill_cmd "fatload mmc 0:1" "") ; run bootminix"
echo echo
echo "# Netbooting." echo "# Netbooting."
echo "serverip=192.168.12.10" echo "serverip=192.168.12.10"
echo "ipaddr=192.168.12.62" echo "ipaddr=192.168.12.62"