[oe-commits] org.oe.dev merge of '0a4d4659daacb61a9f99c17aa64908c24e07b67d'

[hrw commit]

merge of '0a4d4659daacb61a9f99c17aa64908c24e07b67d'
     and '16ef7e010f669266539951f43abdc37a983c762a'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 3ff08e5338d5b8bc5c0a7b72b1ba6b8ad32f3498
ViewMTN: http://monotone.openembedded.org/revision/info/3ff08e5338d5b8bc5c0a7b72b1ba6b8ad32f3498
Files:
1
contrib/mtn2git
conf/machine/cm-x270.conf
packages/linux/linux.inc
packages/linux/linux_2.6.22.bb
Diffs:

#
# mt diff -r0a4d4659daacb61a9f99c17aa64908c24e07b67d -r3ff08e5338d5b8bc5c0a7b72b1ba6b8ad32f3498
#
# 
# 
# add_dir "contrib/mtn2git"
# 
# patch "conf/machine/cm-x270.conf"
#  from [f9429eb200a306ada78b0ff137d01a378b020fbb]
#    to [2a70298c7212dd87450a676741e84bcee83257a2]
# 
============================================================
--- conf/machine/cm-x270.conf	f9429eb200a306ada78b0ff137d01a378b020fbb
+++ conf/machine/cm-x270.conf	2a70298c7212dd87450a676741e84bcee83257a2
@@ -17,6 +17,13 @@ require conf/machine/include/tune-xscale
 # the following line to your local.conf:
 #   CMX270_CONSOLE_SERIAL_PORT = "ttyS0"
 
+# NAND flash eraseblock size
+# most of the older cm-x270 modules are populated with NAND flash
+# that have 128KiB eraseblocks.  Recently, a user encounted
+# a device that has 16KiB eraseblocks.  The following define
+# can be overridden in local.conf if you have one of these devices.
+CMX270_NAND_ERASEBLOCK_SIZE ?= "0x20000"
+
 # the following is for the cm-x270 L module
 CMX270_CONSOLE_SERIAL_PORT ?= "ttyS1"
 
@@ -32,10 +39,10 @@ ROOT_FLASH_SIZE ?= "32"
 ROOT_FLASH_SIZE ?= "32"
 
 # for NAND flash.
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pad --no-cleanmarkers;\
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${CMX270_NAND_ERASEBLOCK_SIZE} --pad --no-cleanmarkers;\
 	sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
 	-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
-	-e 0x20000 -p; \
+	-e ${CMX270_NAND_ERASEBLOCK_SIZE} -p; \
 	cd ${DEPLOY_DIR_IMAGE}; \
 	rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs-summary.jffs2; \
 	ln -s ${IMAGE_NAME}.rootfs-summary.jffs2 ${IMAGE_LINK_NAME}.rootfs-summary.jffs2 \


#
# mt diff -r16ef7e010f669266539951f43abdc37a983c762a -r3ff08e5338d5b8bc5c0a7b72b1ba6b8ad32f3498
#
# 
# 
# patch "packages/linux/linux.inc"
#  from [83d195d472ddda5713c305337cc8ff84620bb56c]
#    to [5398595a8e49265af51d223f13af5a6a2de98ad3]
# 
# patch "packages/linux/linux_2.6.22.bb"
#  from [f0f0a50acdeacf4a36a583128b72dc7eb877f72c]
#    to [1d40bb1274a99baf29a4739f7f3077e688168cb5]
# 
============================================================
--- packages/linux/linux.inc	83d195d472ddda5713c305337cc8ff84620bb56c
+++ packages/linux/linux.inc	5398595a8e49265af51d223f13af5a6a2de98ad3
@@ -111,6 +111,7 @@ KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGE
 UBOOT_ENTRYPOINT ?= "20008000"
 
 KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
+KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}"
 
 do_deploy() {
         install -d ${DEPLOY_DIR_IMAGE}
@@ -130,6 +131,10 @@ do_deploy() {
                 rm -f linux.bin.gz
             fi
         fi
+
+		cd ${DEPLOY_DIR_IMAGE}
+		rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
+		ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin
 }
 
 do_deploy[dirs] = "${S}"
============================================================
--- packages/linux/linux_2.6.22.bb	f0f0a50acdeacf4a36a583128b72dc7eb877f72c
+++ packages/linux/linux_2.6.22.bb	1d40bb1274a99baf29a4739f7f3077e688168cb5
@@ -51,6 +51,15 @@ python do_compulab_image() {
 	    fo.write(size_s)
 	    fo.write(image_data)
 	    fo.close()
+
+	    os.chdir(deploy_dir)
+	    link_file = bb.data.expand('${KERNEL_IMAGE_SYMLINK_NAME}', d) + '.cmx270'
+	    img_file = bb.data.expand('${KERNEL_IMAGE_BASE_NAME}', d) + '.cmx270'
+	    try:
+		os.unlink(link_file)
+	    except:
+		pass
+	    os.symlink(img_file, link_file)
 }
 
 addtask compulab_image after do_deploy before do_package