redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

mkconfig: remove bashisms and cleanup config.mk generation 

This adds some cleanup to mkconfig related to SPL support.  Bash
specific script has been replaced with awk for better shell
compatibility.  config.mk generation is done through a subshell and
single redirect to improve readability.

Signed-off-by: Allen Martin <amartin@nvidia.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>
utp
Allen Martin 2012-08-31 08:30:05 +00:00 committed by Albert ARIBAUD
parent e3e5dac412
commit 0fd37b82f6
1 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
mkconfig
View File

@ -59,12 +59,8 @@ CONFIG_NAME="${1%_config}"
[ "${BOARD_NAME}" ] || BOARD_NAME="${1%_config}"
arch="$2"
cpu="$3"
tmp="${cpu#*:}"
if [ "$tmp" != "$cpu" ] ; then
spl_cpu=$tmp
cpu="${cpu%:*}"
fi
cpu=`echo $3 | awk 'BEGIN {FS = ":"} ; {print $1}'`
spl_cpu=`echo $3 | awk 'BEGIN {FS = ":"} ; {print $2}'`
if [ "$4" = "-" ] ; then
board=${BOARD_NAME}
else
@ -135,21 +131,21 @@ fi
#
# Create include file for Make
#
echo "ARCH = ${arch}" > config.mk
if [ ! -z "$spl_cpu" ] ; then
echo 'ifeq ($(CONFIG_SPL_BUILD),y)' >> config.mk
echo "CPU = ${spl_cpu}" >> config.mk
echo "else" >> config.mk
echo "CPU = ${cpu}" >> config.mk
echo "endif" >> config.mk
else
echo "CPU = ${cpu}" >> config.mk
fi
echo "BOARD = ${board}" >> config.mk
( echo "ARCH = ${arch}"
if [ ! -z "$spl_cpu" ] ; then
echo 'ifeq ($(CONFIG_SPL_BUILD),y)'
echo "CPU = ${spl_cpu}"
echo "else"
echo "CPU = ${cpu}"
echo "endif"
else
echo "CPU = ${cpu}"
fi
echo "BOARD = ${board}"
[ "${vendor}" ] && echo "VENDOR = ${vendor}" >> config.mk
[ "${soc}" ] && echo "SOC = ${soc}" >> config.mk
[ "${vendor}" ] && echo "VENDOR = ${vendor}"
[ "${soc}" ] && echo "SOC = ${soc}"
exit 0 ) > config.mk
# Assign board directory to BOARDIR variable
if [ -z "${vendor}" ] ; then