--- elwix/Attic/install2ub.sh	2013/05/14 09:32:42	1.1.2.2
+++ elwix/Attic/install2ub.sh	2013/05/15 16:30:59	1.1.2.3
@@ -5,7 +5,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: install2ub.sh,v 1.1.2.2 2013/05/14 09:32:42 misho Exp $
+# $Id: install2ub.sh,v 1.1.2.3 2013/05/15 16:30:59 misho Exp $
 #
 
 [ -r ./config/rc.elwix ] && . ./config/rc.elwix
@@ -38,7 +38,10 @@ prepareUB()
 	echo "+++ Prepare ELWIX U-boot kernel ..."
 
 	cp ${KERNEL} ${UB_OBJS}
+	STARTADDR=$(${DEST}/cross_exec.sh nm ${UB_KERNEL} | grep ' _start$' | cut -f1 -d ' ')
 	${DEST}/cross_exec.sh objcopy -O binary ${UB_KERNEL} ${UB_KERNEL}.bin
+	UB_LOADADDR=${UB_LOADADDR:=$STARTADDR}
+	UB_ENTRYADDR=${UB_ENTRYADDR:=$UB_LOADADDR}
 }
 
 compUB()
@@ -51,9 +54,12 @@ compUB()
 			UB_K="${UB_KERNEL}.bin.gz"
 			;;
 		lzma)
-			oldlzma ${UB_KERNEL}.bin
+			oldlzma e ${UB_KERNEL}.bin ${UB_KERNEL}.bin.lzma
 			UB_K="${UB_KERNEL}.bin.lzma"
 			;;
+		none)
+			UB_K="${UB_KERNEL}.bin"
+			;;
 		*)
 			echo "Error:: not supported compress method ..."
 			exit 1
@@ -65,7 +71,7 @@ mkimgUB()
 {
 	echo "+++ Make ELWIX U-boot kernel image ..."
 
-	mkimage -A ${TARGET} -O linux -T kernel -C ${UB_COMPRESS} \
+	uboot_mkimage -A ${TARGET} -O linux -T kernel -C ${UB_COMPRESS} \
 		-a ${UB_LOADADDR} -e ${UB_ENTRYADDR} -n "ELWIX version ${VERSION} kernel" \
 		-d ${UB_K} ${UB_K}.ub
 }