X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=mkconfig;h=0f7f13e3a4d836d6bb8a1ab18b34e63a4125cc2c;hb=eff536befd3efab538bba10bad07ecff63c9f470;hp=4c5675bd3cca3eea89955f8d4feb49dd597d8463;hpb=084f3ddac6ab624a4b1c7174b3cdf9cc25866217;p=oweals%2Fu-boot.git

diff --git a/mkconfig b/mkconfig
index 4c5675bd3c..0f7f13e3a4 100755
--- a/mkconfig
+++ b/mkconfig
@@ -27,6 +27,11 @@ done
 [ $# -lt 4 ] && exit 1
 [ $# -gt 6 ] && exit 1
 
+if [ "${ARCH}" -a "${ARCH}" != "$2" ]; then
+	echo "Failed: \$ARCH=${ARCH}, should be '$2' for ${BOARD_NAME}" 1>&2
+	exit 1
+fi
+
 echo "Configuring for ${BOARD_NAME} board..."
 
 #
@@ -74,6 +79,13 @@ echo "BOARD  = $4" >> 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
 #
@@ -89,7 +101,11 @@ for i in ${TARGETS} ; do
 	echo "#define CONFIG_MK_${i} 1" >>config.h ;
 done
 
-echo "#include <configs/$1.h>" >>config.h
-echo "#include <asm/config.h>" >>config.h
+cat << EOF >> config.h
+#define CONFIG_BOARDDIR board/$BOARDDIR
+#include <config_defaults.h>
+#include <configs/$1.h>
+#include <asm/config.h>
+EOF
 
 exit 0