projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prepare v2014.07-rc1
[platform/kernel/u-boot.git]
/
mkconfig
diff --git
a/mkconfig
b/mkconfig
index
b96c81f
..
cd911a9
100755
(executable)
--- a/
mkconfig
+++ b/
mkconfig
@@
-23,7
+23,7
@@
options=""
if [ \( $# -eq 2 \) -a \( "$1" = "-A" \) ] ; then
# Automatic mode
if [ \( $# -eq 2 \) -a \( "$1" = "-A" \) ] ; then
# Automatic mode
- line=`awk '($0 !~ /^#/ && $7 ~ /^'"$2"'$/) { print $1, $2, $3, $4, $5, $6, $7, $8 }' boards.cfg`
+ line=`awk '($0 !~ /^#/ && $7 ~ /^'"$2"'$/) { print $1, $2, $3, $4, $5, $6, $7, $8 }'
$srctree/
boards.cfg`
if [ -z "$line" ] ; then
echo "make: *** No rule to make target \`$2_config'. Stop." >&2
exit 1
if [ -z "$line" ] ; then
echo "make: *** No rule to make target \`$2_config'. Stop." >&2
exit 1
@@
-55,7
+55,9
@@
CONFIG_NAME="${7%_config}"
arch="$2"
cpu=`echo $3 | awk 'BEGIN {FS = ":"} ; {print $1}'`
spl_cpu=`echo $3 | awk 'BEGIN {FS = ":"} ; {print $2}'`
arch="$2"
cpu=`echo $3 | awk 'BEGIN {FS = ":"} ; {print $1}'`
spl_cpu=`echo $3 | awk 'BEGIN {FS = ":"} ; {print $2}'`
-if [ "$6" = "-" ] ; then
+if [ "$6" = "<none>" ] ; then
+ board=
+elif [ "$6" = "-" ] ; then
board=${BOARD_NAME}
else
board="$6"
board=${BOARD_NAME}
else
board="$6"
@@
-101,10
+103,10
@@
fi
#
# Create link to architecture specific headers
#
#
# Create link to architecture specific headers
#
-if [
"$SRCTREE" != "$OBJTREE
" ] ; then
- mkdir -p ${
OBJTREE
}/include
- LNPREFIX=${
SRCTREE
}/arch/${arch}/include/asm/
- cd ${
OBJTREE
}/include
+if [
-n "$KBUILD_SRC
" ] ; then
+ mkdir -p ${
objtree
}/include
+ LNPREFIX=${
srctree
}/arch/${arch}/include/asm/
+ cd ${
objtree
}/include
mkdir -p asm
else
cd arch/${arch}/include
mkdir -p asm
else
cd arch/${arch}/include
@@
-123,8
+125,8
@@
if [ "${arch}" = "arm" ] ; then
ln -s ${LNPREFIX}proc-armv asm/proc
fi
ln -s ${LNPREFIX}proc-armv asm/proc
fi
-if [
"$SRCTREE" = "$OBJTREE
" ] ; then
- cd ${
SRCTREE
}/include
+if [
-z "$KBUILD_SRC
" ] ; then
+ cd ${
srctree
}/include
fi
#
fi
#
@@
-177,8
+179,8
@@
echo "#define CONFIG_SYS_BOARD \"${board}\"" >> config.h
[ "${soc}" ] && echo "#define CONFIG_SYS_SOC \"${soc}\"" >> config.h
[ "${soc}" ] && echo "#define CONFIG_SYS_SOC \"${soc}\"" >> config.h
+[ "${board}" ] && echo "#define CONFIG_BOARDDIR board/$BOARDDIR" >> config.h
cat << EOF >> config.h
cat << EOF >> config.h
-#define CONFIG_BOARDDIR board/$BOARDDIR
#include <config_cmd_defaults.h>
#include <config_defaults.h>
#include <configs/${CONFIG_NAME}.h>
#include <config_cmd_defaults.h>
#include <config_defaults.h>
#include <configs/${CONFIG_NAME}.h>