[Zrouter-src] ZRouter.org: push to ZRouter boards/D-Link/DIR-632/board.mk boar...

[zrouter-src at zrouter.org]

details:   http://zrouter.org/hg/zrouter//rev/c46079649662
changeset: 416:c46079649662
user:      Aleksandr Rybalko <ray at ddteam.net>
date:      Fri Sep 14 00:25:01 2012 +0300
description:
Allow per-vendor variables in boards/${VENDOR}/vendor.mk file.

diffstat:

 boards/D-Link/DIR-632/board.mk |   1 -
 boards/D-Link/vendor.mk        |   1 +
 boards/boards.mk               |  15 +++++++++++++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diffs (46 lines):

diff -r c2163079c392 -r c46079649662 boards/D-Link/DIR-632/board.mk
--- a/boards/D-Link/DIR-632/board.mk	Thu Sep 13 23:29:54 2012 +0300
+++ b/boards/D-Link/DIR-632/board.mk	Fri Sep 14 00:25:01 2012 +0300
@@ -12,7 +12,6 @@
 # TODO: size suffixes
 BOARD_FLASH_SIZE=8388608
 
-
 ###################################################
 #
 # Vars for kernel config 
diff -r c2163079c392 -r c46079649662 boards/D-Link/vendor.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/boards/D-Link/vendor.mk	Fri Sep 14 00:25:01 2012 +0300
@@ -0,0 +1,1 @@
+# Something required for by this vendor.
diff -r c2163079c392 -r c46079649662 boards/boards.mk
--- a/boards/boards.mk	Thu Sep 13 23:29:54 2012 +0300
+++ b/boards/boards.mk	Fri Sep 14 00:25:01 2012 +0300
@@ -6,7 +6,9 @@
 TARGET_DEVICE=${TARGET_PAIR:C/.*\///}
 .endif
 
-.if exists(${ZROUTER_ROOT}/boards/${TARGET_VENDOR}/) && exists(${ZROUTER_ROOT}/boards/${TARGET_VENDOR}/${TARGET_DEVICE}/)
+.if exists(${ZROUTER_ROOT}/boards/${TARGET_VENDOR}/)
+
+.if exists(${ZROUTER_ROOT}/boards/${TARGET_VENDOR}/${TARGET_DEVICE}/)
 TARGET_BOARDDIR= ${ZROUTER_ROOT}/boards/${TARGET_VENDOR}/${TARGET_DEVICE}
 .include "${TARGET_BOARDDIR}/board.mk"
 
@@ -18,5 +20,14 @@
 BOARD_FIRMWARE_SIGNATURE_FILE=${TARGET_BOARDDIR}/board_firmware.sig
 .endif
 
-.endif
+.else
+.error "No ${ZROUTER_ROOT}/boards/${TARGET_VENDOR}/ board model directory found"
+.endif # exists(${ZROUTER_ROOT}/boards/${TARGET_VENDOR}/${TARGET_DEVICE}/)
 
+.if exists(${ZROUTER_ROOT}/boards/${TARGET_VENDOR}/vendor.mk)
+.include "${ZROUTER_ROOT}/boards/${TARGET_VENDOR}/vendor.mk"
+.endif # exists(${ZROUTER_ROOT}/boards/${TARGET_VENDOR}/vendor.mk)
+
+.else
+.error "No ${ZROUTER_ROOT}/boards/${TARGET_VENDOR}/ board vendor directory found"
+.endif # exists(${ZROUTER_ROOT}/boards/${TARGET_VENDOR}/)