fdt: Add a function to get the node offset of an alias

[J-u-boot.git] / mkconfig

diff --git a/mkconfig b/mkconfig
index d3363c6df37a210cd1bd02ad76286b25df9e1611..84f5a7765b94b9bad19c8c345861d3253bd193f1 100755 (executable)
--- a/mkconfig
+++ b/mkconfig
@@ -5,7 +5,9 @@
 #
 # Parameters:  Target  Architecture  CPU  Board [VENDOR] [SOC]
 #
-# (C) 2002-2010 DENX Software Engineering, Wolfgang Denk <[email protected]>
+# (C) 2002-2013 DENX Software Engineering, Wolfgang Denk <[email protected]>
+#
+# SPDX-License-Identifier:     GPL-2.0+
 #
 
 APPEND=no      # Default: Create new config file
@@ -21,67 +23,60 @@ options=""
 
 if [ \( $# -eq 2 \) -a \( "$1" = "-A" \) ] ; then
        # Automatic mode
-       line=`egrep -i "^[[:space:]]*${2}[[:space:]]" 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
-       }
+       fi
 
        set ${line}
        # add default board name if needed
        [ $# = 3 ] && set ${line} ${1}
-elif [ "${MAKEFLAGS+set}${MAKELEVEL+set}" = "setset" ] ; then
-       # only warn when using a config target in the Makefile
-       cat <<-EOF
-
-       warning: Please migrate to boards.cfg.  Failure to do so will
-                mean removal of your board in the next release.
-
-       EOF
-       sleep 5
 fi
 
 while [ $# -gt 0 ] ; do
        case "$1" in
        --) shift ; break ;;
        -a) shift ; APPEND=yes ;;
-       -n) shift ; BOARD_NAME="${1%_config}" ; shift ;;
+       -n) shift ; BOARD_NAME="${7%_config}" ; shift ;;
        -t) shift ; TARGETS="`echo $1 | sed 's:_: :g'` ${TARGETS}" ; shift ;;
        *)  break ;;
        esac
 done
 
-[ $# -lt 4 ] && exit 1
-[ $# -gt 7 ] && exit 1
+[ $# -lt 7 ] && exit 1
+[ $# -gt 8 ] && exit 1
 
 # Strip all options and/or _config suffixes
-CONFIG_NAME="${1%_config}"
+CONFIG_NAME="${7%_config}"
 
-[ "${BOARD_NAME}" ] || BOARD_NAME="${1%_config}"
+[ "${BOARD_NAME}" ] || BOARD_NAME="${7%_config}"
 
 arch="$2"
 cpu=`echo $3 | awk 'BEGIN {FS = ":"} ; {print $1}'`
 spl_cpu=`echo $3 | awk 'BEGIN {FS = ":"} ; {print $2}'`
-if [ "$4" = "-" ] ; then
-       board=${BOARD_NAME}
-else
-       board="$4"
+
+if [ "$cpu" = "-" ] ; then
+       cpu=
 fi
-[ $# -gt 4 ] && [ "$5" != "-" ] && vendor="$5"
-[ $# -gt 5 ] && [ "$6" != "-" ] && soc="$6"
-[ $# -gt 6 ] && [ "$7" != "-" ] && {
+
+[ "$6" != "-" ] && board="$6"
+[ "$5" != "-" ] && vendor="$5"
+[ "$4" != "-" ] && soc="$4"
+[ $# -gt 7 ] && [ "$8" != "-" ] && {
        # check if we have a board config name in the options field
        # the options field mave have a board config name and a list
        # of options, both separated by a colon (':'); the options are
        # separated by commas (',').
        #
        # Check for board name
-       tmp="${7%:*}"
+       tmp="${8%:*}"
        if [ "$tmp" ] ; then
                CONFIG_NAME="$tmp"
        fi
        # Check if we only have a colon...
-       if [ "${tmp}" != "$7" ] ; then
-               options=${7#*:}
+       if [ "${tmp}" != "$8" ] ; then
+               options=${8#*:}
                TARGETS="`echo ${options} | sed 's:,: :g'` ${TARGETS}"
        fi
 }
@@ -91,6 +86,13 @@ if [ "${ARCH}" -a "${ARCH}" != "${arch}" ]; then
        exit 1
 fi
 
+#
+# Test above needed aarch64, now we need arm
+#
+if [ "${arch}" = "aarch64" ]; then
+       arch="arm"
+fi
+
 if [ "$options" ] ; then
        echo "Configuring for ${BOARD_NAME} - Board: ${CONFIG_NAME}, Options: ${options}"
 else
@@ -100,32 +102,25 @@ fi
 #
 # Create link to architecture specific headers
 #
-if [ "$SRCTREE" != "$OBJTREE" ] ; then
-       mkdir -p ${OBJTREE}/include
-       mkdir -p ${OBJTREE}/include2
-       cd ${OBJTREE}/include2
-       rm -f asm
-       ln -s ${SRCTREE}/arch/${arch}/include/asm asm
-       LNPREFIX=${SRCTREE}/arch/${arch}/include/asm/
-       cd ../include
+if [ -n "$KBUILD_SRC" ] ; then
+       mkdir -p ${objtree}/include
+       LNPREFIX=${srctree}/arch/${arch}/include/asm/
+       cd ${objtree}/include
        mkdir -p asm
 else
-       cd ./include
-       rm -f asm
-       ln -s ../arch/${arch}/include/asm asm
+       cd arch/${arch}/include
 fi
 
 rm -f asm/arch
 
-if [ -z "${soc}" ] ; then
-       ln -s ${LNPREFIX}arch-${cpu} asm/arch
-else
+if [ "${soc}" ] ; then
        ln -s ${LNPREFIX}arch-${soc} asm/arch
+elif [ "${cpu}" ] ; then
+       ln -s ${LNPREFIX}arch-${cpu} asm/arch
 fi
 
-if [ "${arch}" = "arm" ] ; then
-       rm -f asm/proc
-       ln -s ${LNPREFIX}proc-armv asm/proc
+if [ -z "$KBUILD_SRC" ] ; then
+       cd ${srctree}/include
 fi
 
 #
@@ -178,13 +173,14 @@ echo "#define CONFIG_SYS_BOARD \"${board}\"" >> config.h
 
 [ "${soc}"    ] && echo "#define CONFIG_SYS_SOC    \"${soc}\""    >> config.h
 
+[ "${board}"  ] && echo "#define CONFIG_BOARDDIR board/$BOARDDIR" >> 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 <asm/config.h>
 #include <config_fallbacks.h>
+#include <config_uncmd_spl.h>
 EOF
 
 exit 0