From: Rod Whitby <rod@whitby.id.au>
Date: Mon, 13 Nov 2006 12:36:28 +0000 (+0000)
Subject: slugos-image: Now includes the apex second stage loader, and the ixp4xx-npe microcode... 
X-Git-Tag: Release-2010-05/1~9453^2~481^2^2~7
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37bc26da4364658af90eb7da75cb6dd60f9fc074;p=openembedded.git

slugos-image: Now includes the apex second stage loader, and the ixp4xx-npe microcode.  Does not find or load the microcode correctly yet.  Also uses the latest 2.6.19-rc5 kernel.
---

diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 07b144c7c1..299944ee29 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -171,7 +171,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
 # Select the correct versions of the kernel and modules (these are the
 # defaults, override in the conf/distro top-level distro file).
 PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
-PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.18"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.19-rc5"
 
 # Select the smallest provider of x11 libraries
 PREFERRED_PROVIDER_virtual/libx11 ?= "diet-x11"
diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb
index 90a5cefcbe..e59fab165e 100644
--- a/packages/images/slugos-image.bb
+++ b/packages/images/slugos-image.bb
@@ -115,7 +115,7 @@ python () {
 # it is a bad idea to produce flash images without a valid RedBoot - that allows
 # an innocent user upgrade attempt to instantly brick the NSLU2.
 PACK_IMAGE += "${@['', 'nslu2_pack_image;'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'nslu2']}"
-PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'nslu2']}"
+PACK_IMAGE_DEPENDS += "${@['', 'slugimage-native nslu2-linksys-firmware apex ixp4xx-npe'][bb.data.getVar('SLUGOS_FLASH_IMAGE', d, 1) == 'nslu2']}"
 
 NSLU2_SLUGIMAGE_ARGS ?= ""
 
@@ -127,13 +127,16 @@ nslu2_pack_image() {
 				${STAGING_LIBDIR}/nslu2-binaries/Trailer \
 				${STAGING_LIBDIR}/nslu2-binaries/SysConf \
 				${DEPLOY_DIR_IMAGE}/slug/
+		install -m 0644 ${STAGING_LOADER_DIR}/apex.bin ${DEPLOY_DIR_IMAGE}/slug/
 		install -m 0644 ${DEPLOY_DIR_IMAGE}/zImage-nslu2${ARCH_BYTE_SEX} \
 			${DEPLOY_DIR_IMAGE}/slug/vmlinuz
 		install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
 			${DEPLOY_DIR_IMAGE}/slug/flashdisk.jffs2
+		install -m 0644 ${STAGING_FIRMWARE_DIR}/NPE-B ${DEPLOY_DIR_IMAGE}/slug/
 		cd ${DEPLOY_DIR_IMAGE}/slug
-		slugimage -p -b RedBoot -s SysConf -r Ramdisk:1,Flashdisk:flashdisk.jffs2 -t \
-			Trailer -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img \
+		slugimage -p -b RedBoot -s SysConf -L apex.bin -k vmlinuz \
+			-r Flashdisk:flashdisk.jffs2 -m NPE-B -t Trailer \
+			-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.flashdisk.img \
 			${NSLU2_SLUGIMAGE_ARGS}
 		rm -rf ${DEPLOY_DIR_IMAGE}/slug
 	fi