[oe-commits] org.oe.dev 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.

[rwhitby commit]

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.

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 2d7ccf067fb2306addce3d751e077c398ca4df93
ViewMTN: http://monotone.openembedded.org/revision.psp?id=2d7ccf067fb2306addce3d751e077c398ca4df93
Files:
1
conf/distro/include/slugos.inc
packages/images/slugos-image.bb
Diffs:

#
# mt diff -r712d4d956b341cbac9ae79ea64ea6ddda313eaec -r2d7ccf067fb2306addce3d751e077c398ca4df93
#
# 
# 
# patch "conf/distro/include/slugos.inc"
#  from [6b6326954b48f5ec43843fa6969e8ec7d70f01c3]
#    to [79e2e3f5968c1dcce75f096cfa20358f38f0b112]
# 
# patch "packages/images/slugos-image.bb"
#  from [917ec13131c977e3ffba8a9730b63c1bab3f75be]
#    to [c949877b43607de43551dd3ea29209141fd0a261]
# 
============================================================
--- conf/distro/include/slugos.inc	6b6326954b48f5ec43843fa6969e8ec7d70f01c3
+++ conf/distro/include/slugos.inc	79e2e3f5968c1dcce75f096cfa20358f38f0b112
@@ -171,7 +171,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "ix
 # 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"
============================================================
--- packages/images/slugos-image.bb	917ec13131c977e3ffba8a9730b63c1bab3f75be
+++ packages/images/slugos-image.bb	c949877b43607de43551dd3ea29209141fd0a261
@@ -115,7 +115,7 @@ PACK_IMAGE += "${@['', 'nslu2_pack_image
 # 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