[Zrouter-src] ZRouter.org: push to ZRouter Makefile

Sun Dec 11 13:37:09 UTC 2011

details:   http://zrouter.org/hg/zrouter//rev/2377375b221c
changeset: 267:2377375b221c
user:      ray at terran.dlink.ua
date:      Sun Dec 11 15:36:54 2011 +0200
description:
update usage of ubnt-mkfwimage with kernel load address + kernel entry point

diffstat:

 Makefile |  18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diffs (40 lines):

diff -r daa7856fb1d1 -r 2377375b221c Makefile

--- a/Makefile	Sun Dec 11 15:32:33 2011 +0200
+++ b/Makefile	Sun Dec 11 15:36:54 2011 +0200
@@ -512,8 +512,15 @@
 MKULZMA_FLAGS?=-v
 MKULZMA_BLOCKSIZE?=131072
 
-UBOOT_KERNEL_LOAD_ADDRESS?=80001000
-UBOOT_KERNEL_ENTRY_POINT?=${UBOOT_KERNEL_LOAD_ADDRESS}
+KERNCONF_KERNENTRYPOINT?=${KERNCONF_KERNLOADADDR}
+
+UBOOT_KERNEL_LOAD_ADDRESS?=${KERNCONF_KERNLOADADDR}
+UBOOT_KERNEL_ENTRY_POINT?=${KERNCONF_KERNENTRYPOINT}
+
+UBNT_FIRMWARE_IMAGE_SIZE_MAX?=${FIRMWARE_IMAGE_SIZE_MAX}
+UBNT_KERNEL_LOAD_ADDRESS?=${KERNCONF_KERNLOADADDR}
+UBNT_KERNEL_ENTRY_POINT?=${KERNCONF_KERNENTRYPOINT}
+UBNT_KERNEL_FLASH_BASE?=0xbf030000
 
 ZROUTER_VERSION?=0.1-ALPHA
 
@@ -544,16 +551,13 @@
 .endif
 .endif
 
-UBNT_FIRMWARE_IMAGE_SIZE_MAX?=${FIRMWARE_IMAGE_SIZE_MAX}
-UBNT_KERNEL_ENTRY?=${KERNCONF_KERNLOADADDR}
-UBNT_KERNEL_FLASH_BASE?=0xbf030000
-
 ubntimage:	${KERNEL_PACKED_NAME} ${ROOTFS_PACKED_NAME} ${ZTOOLS_PATH}/ubnt-mkfwimage
 	@echo "++++++++++++++ Making $@ ++++++++++++++"
 	PATH=${IMAGE_BUILD_PATHS} ubnt-mkfwimage	\
 	    -v "${UBNT_VERSION}"			\
 	    -s "${UBNT_KERNEL_FLASH_BASE}"		\
-	    -e "${UBNT_KERNEL_ENTRY}"		\
+	    -l "${UBNT_KERNEL_LOAD_ADDRESS}"		\
+	    -e "${UBNT_KERNEL_ENTRY_POINT}"		\
 	    -m "${UBNT_FIRMWARE_IMAGE_SIZE_MAX}"	\
 	    -k "${KERNEL_PACKED_NAME}"			\
 	    -r "${ROOTFS_PACKED_NAME}"			\
