summaryrefslogtreecommitdiffstats
path: root/mkconfig
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-12-05 02:11:59 +0100
committerWolfgang Denk <wd@denx.de>2009-12-05 02:11:59 +0100
commit2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70 (patch)
treee19b3def6c8f41f56cdb5e8b71aa53d8f72f5812 /mkconfig
parentcd514aeb996e2f7aefbe1f78481965d9d074aed4 (diff)
parentf68ab43de67f59925542efb6bcec30f4a84fe695 (diff)
downloadu-boot-2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70.tar.gz
u-boot-2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70.tar.xz
u-boot-2a49bf3149e34e6f910e70bbc0a26e81cfdbdf70.zip
Merge branch 'master' into next
Conflicts: board/esd/plu405/plu405.c drivers/rtc/ftrtc010.c Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'mkconfig')
-rwxr-xr-xmkconfig5
1 files changed, 5 insertions, 0 deletions
diff --git a/mkconfig b/mkconfig
index bdc9d91d17..27d9f2bac7 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..."
#