[Zrouter-src] ZRouter.org: push to ZRouter Makefile boards/Asus/WL-500GP_V2/bo...

zrouter-src at zrouter.org zrouter-src at zrouter.org
Wed Dec 14 11:26:28 UTC 2011


details:   http://zrouter.org/hg/zrouter//rev/54eaf8c60356
changeset: 275:54eaf8c60356
user:      ray at terran.dlink.ua
date:      Wed Dec 14 12:51:16 2011 +0200
description:
Define variable with target image, so we no longer need to build kernel and
rootfs separate.
NEW_IMAGE_TYPE
Possible value:
zimage		- concatenated kernel and rootfs
trximage	- packet with asustrx
ubntimage	- packed with ubnt-mkimage
split_kernel_rootfs - leave kernel and rootfs separate

diffstat:

 Makefile                               |  12 +++++++++---
 boards/Asus/WL-500GP_V2/board.mk       |   2 +-
 boards/D-Link/DAP-1350/board.mk        |   2 +-
 boards/D-Link/DIR-320-NRU/board.mk     |   2 +-
 boards/D-Link/DIR-320/board.mk         |   1 +
 boards/D-Link/DIR-330/board.mk         |   1 +
 boards/D-Link/DIR-615-E4/board.mk      |   2 +-
 boards/D-Link/DIR-620/board.mk         |   2 +-
 boards/D-Link/DIR-620Sec/board.mk      |   2 +-
 boards/D-Link/DIR-632/board.mk         |   2 +-
 boards/D-Link/DSA-3110-A1/board.mk     |   2 +-
 boards/D-Link/DSR-1000/board.mk        |   2 +-
 boards/D-Link/DSR-1000N/board.mk       |   2 +-
 boards/D-Link/DSR-500/board.mk         |   2 +-
 boards/D-Link/DSR-500N/board.mk        |   2 +-
 boards/NorthQ/NQ-900/board.mk          |   1 +
 boards/NorthQ/NQ-901/board.mk          |   1 +
 boards/Soekris/4501/board.mk           |   2 +-
 boards/TPLink/TL-WR941ND-v3_2/board.mk |   3 ++-
 boards/Ubiquiti/RSPRO/board.mk         |   2 +-
 20 files changed, 29 insertions(+), 18 deletions(-)

diffs (211 lines):

diff -r ddbcd130690b -r 54eaf8c60356 Makefile
--- a/Makefile	Wed Dec 14 12:44:15 2011 +0200
+++ b/Makefile	Wed Dec 14 12:51:16 2011 +0200
@@ -402,7 +402,6 @@
 
 # XXX Must make makefs, mkulzma with [kernel-]toolchain + uboot_mkimage and old lzma ports 
 
-all:	world kernel ports
 IMAGE_SUFFIX?=trx
 ZTOOLS_PATH=${ZROUTER_OBJ}/ztools
 NEW_KERNEL=${ZROUTER_OBJ}/${TARGET_VENDOR}_${TARGET_DEVICE}_kernel
@@ -534,14 +533,14 @@
 #
 # TODO: comment here
 #
-fwimage ${NEW_IMAGE}:  ${KERNEL_PACKED_NAME} ${ROOTFS_PACKED_NAME}	${ZTOOLS_PATH}/asustrx
+trximage ${NEW_MAGE}:  ${KERNEL_PACKED_NAME} ${ROOTFS_PACKED_NAME}	${ZTOOLS_PATH}/asustrx
 	@echo "++++++++++++++ Making [email protected] ++++++++++++++"
 	PATH=${IMAGE_BUILD_PATHS} asustrx -o ${NEW_IMAGE} ${KERNEL_PACKED_NAME} ${ROOTFS_PACKED_NAME}
 
 # zimage used when it possible to use any formats (CFI devices must use trx 
 # format, but U-Boot devices must use only kernel in U-Boot format )
 zimage:		${KERNEL_PACKED_NAME} ${ROOTFS_PACKED_NAME}
-	cat ${KERNEL_PACKED_NAME} ${ROOTFS_PACKED_NAME} > ${NEW_IMAGE}
+	cat ${KERNEL_PACKED_NAME} ${ROOTFS_PACKED_NAME} ${BOARD_FIRMWARE_SIGNATURE_FILE} > ${NEW_IMAGE}
 	IMGMD5=`md5 ${NEW_IMAGE} | cut -f4 -d' '` ; \
 	cp ${NEW_IMAGE} ${ZROUTER_OBJ}/${TARGET_VENDOR}_${TARGET_DEVICE}-${ZROUTER_VERSION}.$${IMGMD5}.${IMAGE_SUFFIX}
 
@@ -563,6 +562,13 @@
 	    -r "${ROOTFS_PACKED_NAME}"			\
 	    -o "${NEW_IMAGE}"
 
+split_kernel_rootfs:	${KERNEL_PACKED_NAME} ${ROOTFS_PACKED_NAME}
+	touch "${NEW_IMAGE}"
+
+${NEW_IMAGE}:	${NEW_IMAGE_TYPE}
+
+all:	world kernel ports ${NEW_IMAGE}
+
 .include <bsd.obj.mk>
 
 
diff -r ddbcd130690b -r 54eaf8c60356 boards/Asus/WL-500GP_V2/board.mk
--- a/boards/Asus/WL-500GP_V2/board.mk	Wed Dec 14 12:44:15 2011 +0200
+++ b/boards/Asus/WL-500GP_V2/board.mk	Wed Dec 14 12:51:16 2011 +0200
@@ -54,4 +54,4 @@
 
 IMAGE_TYPE=trx
 IMAGE_SUFFIX=trx
-
+NEW_IMAGE_TYPE=trximage
diff -r ddbcd130690b -r 54eaf8c60356 boards/D-Link/DAP-1350/board.mk
--- a/boards/D-Link/DAP-1350/board.mk	Wed Dec 14 12:44:15 2011 +0200
+++ b/boards/D-Link/DAP-1350/board.mk	Wed Dec 14 12:51:16 2011 +0200
@@ -2,4 +2,4 @@
 SOC_VENDOR=Ralink
 SOC_CHIP=RT3052F
 
-
+NEW_IMAGE_TYPE=zimage
diff -r ddbcd130690b -r 54eaf8c60356 boards/D-Link/DIR-320-NRU/board.mk
--- a/boards/D-Link/DIR-320-NRU/board.mk	Wed Dec 14 12:44:15 2011 +0200
+++ b/boards/D-Link/DIR-320-NRU/board.mk	Wed Dec 14 12:51:16 2011 +0200
@@ -66,4 +66,4 @@
 PACKING_ROOTFS_IMAGE?=rootfs_clean.iso.ulzma
 
 IMAGE_SUFFIX=zimage
-
+NEW_IMAGE_TYPE=zimage
diff -r ddbcd130690b -r 54eaf8c60356 boards/D-Link/DIR-320/board.mk
--- a/boards/D-Link/DIR-320/board.mk	Wed Dec 14 12:44:15 2011 +0200
+++ b/boards/D-Link/DIR-320/board.mk	Wed Dec 14 12:51:16 2011 +0200
@@ -90,3 +90,4 @@
 # Image must not be biggest than GEOM_MAP_P2 (upgrade part.)
 FIRMWARE_IMAGE_SIZE_MAX=0x003a0000
 
+NEW_IMAGE_TYPE=trximage
diff -r ddbcd130690b -r 54eaf8c60356 boards/D-Link/DIR-330/board.mk
--- a/boards/D-Link/DIR-330/board.mk	Wed Dec 14 12:44:15 2011 +0200
+++ b/boards/D-Link/DIR-330/board.mk	Wed Dec 14 12:51:16 2011 +0200
@@ -3,3 +3,4 @@
 SOC_VENDOR=Broadcom
 SOC_CHIP=BCM5836
 
+NEW_IMAGE_TYPE=trximage
diff -r ddbcd130690b -r 54eaf8c60356 boards/D-Link/DIR-615-E4/board.mk
--- a/boards/D-Link/DIR-615-E4/board.mk	Wed Dec 14 12:44:15 2011 +0200
+++ b/boards/D-Link/DIR-615-E4/board.mk	Wed Dec 14 12:51:16 2011 +0200
@@ -96,4 +96,4 @@
 PACKING_ROOTFS_IMAGE?=rootfs_clean.iso.ulzma
 
 IMAGE_SUFFIX=zimage
-
+NEW_IMAGE_TYPE=zimage
diff -r ddbcd130690b -r 54eaf8c60356 boards/D-Link/DIR-620/board.mk
--- a/boards/D-Link/DIR-620/board.mk	Wed Dec 14 12:44:15 2011 +0200
+++ b/boards/D-Link/DIR-620/board.mk	Wed Dec 14 12:51:16 2011 +0200
@@ -67,4 +67,4 @@
 PACKING_ROOTFS_IMAGE?=rootfs_clean.iso.ulzma
 
 IMAGE_SUFFIX=zimage
-
+NEW_IMAGE_TYPE=zimage
diff -r ddbcd130690b -r 54eaf8c60356 boards/D-Link/DIR-620Sec/board.mk
--- a/boards/D-Link/DIR-620Sec/board.mk	Wed Dec 14 12:44:15 2011 +0200
+++ b/boards/D-Link/DIR-620Sec/board.mk	Wed Dec 14 12:51:16 2011 +0200
@@ -66,4 +66,4 @@
 PACKING_ROOTFS_IMAGE?=rootfs_clean.iso.ulzma
 
 IMAGE_SUFFIX=zimage
-
+NEW_IMAGE_TYPE=zimage
diff -r ddbcd130690b -r 54eaf8c60356 boards/D-Link/DIR-632/board.mk
--- a/boards/D-Link/DIR-632/board.mk	Wed Dec 14 12:44:15 2011 +0200
+++ b/boards/D-Link/DIR-632/board.mk	Wed Dec 14 12:51:16 2011 +0200
@@ -118,4 +118,4 @@
 PACKING_ROOTFS_IMAGE?=rootfs_clean.iso.ulzma
 
 IMAGE_SUFFIX=zimage
-
+NEW_IMAGE_TYPE=zimage
diff -r ddbcd130690b -r 54eaf8c60356 boards/D-Link/DSA-3110-A1/board.mk
--- a/boards/D-Link/DSA-3110-A1/board.mk	Wed Dec 14 12:44:15 2011 +0200
+++ b/boards/D-Link/DSA-3110-A1/board.mk	Wed Dec 14 12:51:16 2011 +0200
@@ -70,4 +70,4 @@
 
 
 IMAGE_SUFFIX=zimage
-
+NEW_IMAGE_TYPE=split_kernel_rootfs
diff -r ddbcd130690b -r 54eaf8c60356 boards/D-Link/DSR-1000/board.mk
--- a/boards/D-Link/DSR-1000/board.mk	Wed Dec 14 12:44:15 2011 +0200
+++ b/boards/D-Link/DSR-1000/board.mk	Wed Dec 14 12:51:16 2011 +0200
@@ -63,4 +63,4 @@
 PACKING_KERNEL_IMAGE?=kernel.kbin.oldlzma.uboot.sync
 PACKING_ROOTFS_IMAGE?=rootfs_clean.iso.ulzma
 
-
+NEW_IMAGE_TYPE=split_kernel_rootfs
diff -r ddbcd130690b -r 54eaf8c60356 boards/D-Link/DSR-1000N/board.mk
--- a/boards/D-Link/DSR-1000N/board.mk	Wed Dec 14 12:44:15 2011 +0200
+++ b/boards/D-Link/DSR-1000N/board.mk	Wed Dec 14 12:51:16 2011 +0200
@@ -91,4 +91,4 @@
 PACKING_KERNEL_IMAGE?=kernel.kbin.oldlzma.uboot.sync
 PACKING_ROOTFS_IMAGE?=rootfs_clean.iso.ulzma
 
-
+NEW_IMAGE_TYPE=split_kernel_rootfs
diff -r ddbcd130690b -r 54eaf8c60356 boards/D-Link/DSR-500/board.mk
--- a/boards/D-Link/DSR-500/board.mk	Wed Dec 14 12:44:15 2011 +0200
+++ b/boards/D-Link/DSR-500/board.mk	Wed Dec 14 12:51:16 2011 +0200
@@ -63,4 +63,4 @@
 PACKING_KERNEL_IMAGE?=kernel.kbin.oldlzma.uboot.sync
 PACKING_ROOTFS_IMAGE?=rootfs_clean.iso.ulzma
 
-
+NEW_IMAGE_TYPE=split_kernel_rootfs
diff -r ddbcd130690b -r 54eaf8c60356 boards/D-Link/DSR-500N/board.mk
--- a/boards/D-Link/DSR-500N/board.mk	Wed Dec 14 12:44:15 2011 +0200
+++ b/boards/D-Link/DSR-500N/board.mk	Wed Dec 14 12:51:16 2011 +0200
@@ -89,4 +89,4 @@
 PACKING_KERNEL_IMAGE?=kernel.kbin.oldlzma.uboot.sync
 PACKING_ROOTFS_IMAGE?=rootfs_clean.iso.ulzma
 
-
+NEW_IMAGE_TYPE=split_kernel_rootfs
diff -r ddbcd130690b -r 54eaf8c60356 boards/NorthQ/NQ-900/board.mk
--- a/boards/NorthQ/NQ-900/board.mk	Wed Dec 14 12:44:15 2011 +0200
+++ b/boards/NorthQ/NQ-900/board.mk	Wed Dec 14 12:51:16 2011 +0200
@@ -102,3 +102,4 @@
 PACKING_KERNEL_IMAGE?=kernel.kbin.gz.sync
 PACKING_ROOTFS_IMAGE?=rootfs_clean.iso.ulzma
 
+NEW_IMAGE_TYPE=trximage
diff -r ddbcd130690b -r 54eaf8c60356 boards/NorthQ/NQ-901/board.mk
--- a/boards/NorthQ/NQ-901/board.mk	Wed Dec 14 12:44:15 2011 +0200
+++ b/boards/NorthQ/NQ-901/board.mk	Wed Dec 14 12:51:16 2011 +0200
@@ -59,3 +59,4 @@
 # Image must not be biggest than GEOM_MAP_P4 (upgrade part.)
 FIRMWARE_IMAGE_SIZE_MAX=0x007b0000
 
+NEW_IMAGE_TYPE=zimage
diff -r ddbcd130690b -r 54eaf8c60356 boards/Soekris/4501/board.mk
--- a/boards/Soekris/4501/board.mk	Wed Dec 14 12:44:15 2011 +0200
+++ b/boards/Soekris/4501/board.mk	Wed Dec 14 12:51:16 2011 +0200
@@ -56,4 +56,4 @@
 PACKING_ROOTFS_IMAGE?=rootfs
 
 IMAGE_SUFFIX=zimage
-
+NEW_IMAGE_TYPE=split_kernel_rootfs
diff -r ddbcd130690b -r 54eaf8c60356 boards/TPLink/TL-WR941ND-v3_2/board.mk
--- a/boards/TPLink/TL-WR941ND-v3_2/board.mk	Wed Dec 14 12:44:15 2011 +0200
+++ b/boards/TPLink/TL-WR941ND-v3_2/board.mk	Wed Dec 14 12:51:16 2011 +0200
@@ -86,5 +86,6 @@
 PACKING_KERNEL_IMAGE?=kernel.kbin.oldlzma.uboot.sync
 PACKING_ROOTFS_IMAGE?=rootfs_clean.iso.ulzma
 
+# XXX: must be TP-Link packing utility
+NEW_IMAGE_TYPE=ubntimage
 
-
diff -r ddbcd130690b -r 54eaf8c60356 boards/Ubiquiti/RSPRO/board.mk
--- a/boards/Ubiquiti/RSPRO/board.mk	Wed Dec 14 12:44:15 2011 +0200
+++ b/boards/Ubiquiti/RSPRO/board.mk	Wed Dec 14 12:51:16 2011 +0200
@@ -86,4 +86,4 @@
 
 UBNT_VERSION?=RSPRO.ar7100pro.V1
 
-
+NEW_IMAGE_TYPE=ubntimage


More information about the Zrouter-src mailing list