projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
SPI: Fix 32 bit transfers in mxc_spi.c
[oweals/u-boot.git]
/
mkconfig
diff --git
a/mkconfig
b/mkconfig
old mode 100644
(file)
new mode 100755
(executable)
index
5d2eb1e
..
0f7f13e
--- a/
mkconfig
+++ b/
mkconfig
@@
-3,44
+3,88
@@
# Script to create header files and links to configure
# U-Boot for a specific board.
#
# Script to create header files and links to configure
# U-Boot for a specific board.
#
-# Parameters: Target Architecture CPU Board
+# Parameters: Target Architecture CPU Board
[VENDOR] [SOC]
#
#
-# (C) 2002 DENX Software Engineering, Wolfgang Denk <wd@denx.de>
+# (C) 2002
-2006
DENX Software Engineering, Wolfgang Denk <wd@denx.de>
#
APPEND=no # Default: Create new config file
#
APPEND=no # Default: Create new config file
+BOARD_NAME="" # Name to print in make output
+TARGETS=""
while [ $# -gt 0 ] ; do
case "$1" in
--) shift ; break ;;
-a) shift ; APPEND=yes ;;
while [ $# -gt 0 ] ; do
case "$1" in
--) shift ; break ;;
-a) shift ; APPEND=yes ;;
+ -n) shift ; BOARD_NAME="${1%%_config}" ; shift ;;
+ -t) shift ; TARGETS="`echo $1 | sed 's:_: :g'` ${TARGETS}" ; shift ;;
*) break ;;
esac
done
*) break ;;
esac
done
+[ "${BOARD_NAME}" ] || BOARD_NAME="$1"
+
[ $# -lt 4 ] && exit 1
[ $# -lt 4 ] && exit 1
-[ $# -gt
5
] && exit 1
+[ $# -gt
6
] && exit 1
-echo "Configuring for $1 board..."
+if [ "${ARCH}" -a "${ARCH}" != "$2" ]; then
+ echo "Failed: \$ARCH=${ARCH}, should be '$2' for ${BOARD_NAME}" 1>&2
+ exit 1
+fi
-cd ./include
+echo "Configuring for ${BOARD_NAME} board..."
#
# Create link to architecture specific headers
#
#
# Create link to architecture specific headers
#
-rm -f asm
-ln -s asm-$2 asm
+if [ "$SRCTREE" != "$OBJTREE" ] ; then
+ mkdir -p ${OBJTREE}/include
+ mkdir -p ${OBJTREE}/include2
+ cd ${OBJTREE}/include2
+ rm -f asm
+ ln -s ${SRCTREE}/include/asm-$2 asm
+ LNPREFIX="../../include2/asm/"
+ cd ../include
+ rm -rf asm-$2
+ rm -f asm
+ mkdir asm-$2
+ ln -s asm-$2 asm
+else
+ cd ./include
+ rm -f asm
+ ln -s asm-$2 asm
+fi
+
rm -f asm-$2/arch
rm -f asm-$2/arch
-ln -s arch-$3 asm-$2/arch
+
+if [ -z "$6" -o "$6" = "NULL" ] ; then
+ ln -s ${LNPREFIX}arch-$3 asm-$2/arch
+else
+ ln -s ${LNPREFIX}arch-$6 asm-$2/arch
+fi
+
+if [ "$2" = "arm" ] ; then
+ rm -f asm-$2/proc
+ ln -s ${LNPREFIX}proc-armv asm-$2/proc
+fi
#
# Create include file for Make
#
#
# Create include file for Make
#
-echo "ARCH = $2" > config.mk
-echo "CPU = $3" >> config.mk
-echo "BOARD = $4" >> config.mk
+echo "ARCH = $2" > config.mk
+echo "CPU = $3" >> config.mk
+echo "BOARD = $4" >> config.mk
+
+[ "$5" ] && [ "$5" != "NULL" ] && echo "VENDOR = $5" >> config.mk
-[ "$5" ] && echo "VENDOR = $5" >> config.mk
+[ "$6" ] && [ "$6" != "NULL" ] && echo "SOC = $6" >> config.mk
+
+# Assign board directory to BOARDIR variable
+if [ -z "$5" -o "$5" = "NULL" ] ; then
+ BOARDDIR=$4
+else
+ BOARDDIR=$5/$4
+fi
#
# Create board specific header file
#
# Create board specific header file
@@
-52,6
+96,16
@@
else
> config.h # Create new config file
fi
echo "/* Automatically generated - do not edit */" >>config.h
> config.h # Create new config file
fi
echo "/* Automatically generated - do not edit */" >>config.h
-echo "#include <configs/$1.h>" >>config.h
+
+for i in ${TARGETS} ; do
+ echo "#define CONFIG_MK_${i} 1" >>config.h ;
+done
+
+cat << EOF >> config.h
+#define CONFIG_BOARDDIR board/$BOARDDIR
+#include <config_defaults.h>
+#include <configs/$1.h>
+#include <asm/config.h>
+EOF
exit 0
exit 0