Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

4 files changed, 35 insertions, 28 deletions

diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
index be38858ae9..f58feb686c 100644
--- a/conf/machine/include/kirkwood.inc
+++ b/conf/machine/include/kirkwood.inc
@@ -11,7 +11,9 @@ USE_DEVFS = "0"
 PREFERRED_PROVIDER_virtual/bootloader = ""
 PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood"
 
-IMAGE_FSTYPES += "tar.gz"
+MACHINE_KERNEL_PR = "r1"
+
+IMAGE_FSTYPES += "tar.gz ubi"
 SERIAL_CONSOLE = "ttyS0 115200"
 
 # Currently all the orion devices we support use uImage
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 5e4e1ac579..71fea7a508 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -44,32 +44,19 @@ KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}"
 MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
 
 zaurus_make_installkit () {
-    cd ${DEPLOY_DIR_IMAGE}
-    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/         
-    mkdir ${IMAGE_NAME}-installkit/
-
-    # Get the latest kernel using the ${KERNEL_IMAGETYPE}-<machine>.bin symlink
-    if [ "${@base_contains('MACHINE_FEATURES', 'kexecboot', 'true', 'false',d)}" = "true" ]; then
-	    [ -f "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin" ] && cp ${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin ${IMAGE_NAME}-installkit/${KERNEL_IMAGETYPE}
-	    # we need also tgz for mmc or cf cards
-	    cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/image.tgz
-    else
-	    cp ${KERNEL_IMAGETYPE}-${MACHINE}.bin ${IMAGE_NAME}-installkit/${KERNEL_IMAGETYPE}
-    fi
-
-    if [ "${MACHINE}" = "spitz" ]; then
-        cp gnu-tar ${IMAGE_NAME}-installkit/
-        cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz
-    else
-        [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
-    fi
-
-    cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
-   
+
+	cd ${DEPLOY_DIR_IMAGE}
+	rm -rf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}/         
+	mkdir installkit-${MACHINE}/
+
+	[ -f "${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin" ] && cp ${KERNEL_IMAGETYPE}-kexecboot-${MACHINE}.bin installkit-${MACHINE}/${KERNEL_IMAGETYPE}
+
+	cp updater.sh.${MACHINE} installkit-${MACHINE}/updater.sh
  
-    tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/
-    md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
-    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/     
+	tar czf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz installkit-${MACHINE}/
+	md5sum ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz > ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}.tar.gz.md5
+	rm -rf ${DEPLOY_DIR_IMAGE}/installkit-${MACHINE}/     
+
 }
 
 require conf/machine/include/kexecboot.inc
diff --git a/conf/machine/include/zaurus-clamshell.inc b/conf/machine/include/zaurus-clamshell.inc
index cc58c4a48b..c3bbca856a 100644
--- a/conf/machine/include/zaurus-clamshell.inc
+++ b/conf/machine/include/zaurus-clamshell.inc
@@ -1,7 +1,10 @@
 include conf/machine/include/tune-xscale.inc
 
-UBOOT_ENTRYPOINT = "0xA0008000"
-UBOOT_LOADADDRESS = "0xA0008000"
+UBOOT_ENTRYPOINT_c7x0 = "0xA0008000"
+UBOOT_ENTRYPOINT_akita = "0xA1000000"
+UBOOT_ENTRYPOINT_spitz = "0xA1000000"
+
+UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
 
 EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700"
 KEXECBOOT_IMAGEDEPENDS += "sharp-flash-header-c700"
diff --git a/conf/machine/sheevaplug.conf b/conf/machine/sheevaplug.conf
index ee9ba6cb88..4517312e7a 100644
--- a/conf/machine/sheevaplug.conf
+++ b/conf/machine/sheevaplug.conf
@@ -3,4 +3,19 @@
 MACHINE_EXTRA_RDEPENDS          = "u-boot-utils"
 MACHINE_EXTRA_RRECOMMENDS       = "kernel-modules"
 
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    129024 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 4096 LEBs
+MKUBIFS_ARGS = "-m 2048 -e 129024 -c 4096"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
+
 require conf/machine/include/kirkwood.inc