diff -r 58b533061659 Makefile --- a/Makefile Wed Jan 11 17:31:51 2012 +0200 +++ b/Makefile Mon Jan 16 01:45:22 2012 +0100 @@ -550,7 +550,6 @@ UBNT_KERNEL_ENTRY_POINT?= ${KERNCONF_KERNENTRYPOINT} UBNT_KERNEL_FLASH_BASE?= 0xbf030000 -TPLINK_ROOTFS_START?= XXX_TODO TPLINK_KERN_LOADADDR?= ${KERNCONF_KERNLOADADDR} TPLINK_KERN_STARTADDR?= ${KERNCONF_KERNENTRYPOINT} TPLINK_IMG_NAME?= ZRouter.org @@ -599,20 +598,28 @@ # and need "mktplinkfw" for building the firmware tplink_image: ${KERNEL_PACKED_NAME} ${ROOTFS_PACKED_NAME} ${ZTOOLS_PATH}/mktplinkfw @echo "++++++++++++++ Making $@ ++++++++++++++" - if [ "x${TPLINK_BOARDTYPE}" = "x" ] ; then \ + @if [ "x${TPLINK_BOARDTYPE}" = "x" ] ; then \ echo "TPLINK_BOARDTYPE must be defined"; \ exit 1; \ fi + @if [ "x${KERNEL_MAP_START}" = "x" ] ; then \ + echo "KERNEL_MAP_START must be defined, this is the hint.map.?.start ";\ + echo "address from board.hints where hint.map.?.name='kernel'"; \ + exit 1; \ + fi + KERNEL_PACKED_SIZE=`stat -f %z "${KERNEL_PACKED_NAME}"`; \ + TPLINK_ROOTFS_START=`printf "%#x" $$(( ${KERNEL_MAP_START} + $${KERNEL_PACKED_SIZE} ))`; \ PATH=${IMAGE_BUILD_PATHS} mktplinkfw \ -B ${TPLINK_BOARDTYPE} \ - -R ${TPLINK_ROOTFS_START} \ + -R $${TPLINK_ROOTFS_START} \ -L ${TPLINK_KERN_LOADADDR} \ -E ${TPLINK_KERN_STARTADDR} \ -k "${KERNEL_PACKED_NAME}" \ -N ${TPLINK_IMG_NAME} \ -V ${TPLINK_IMG_VERSION} \ -r "${ROOTFS_PACKED_NAME}" \ - -o "${NEW_IMAGE}" + -o "${NEW_IMAGE}" && \ + PATH=${IMAGE_BUILD_PATHS} mktplinkfw -i "${NEW_IMAGE}" split_kernel_rootfs: ${KERNEL_PACKED_NAME} ${ROOTFS_PACKED_NAME}