[oe-commits] org.oe.dev linux 2.6.22: merge cm-x270 kernel (from compulab-pxa270 recipe)

[hrw commit]

linux 2.6.22: merge cm-x270 kernel (from compulab-pxa270 recipe)

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: c7d233d13bec38f6add0756be85ac16f62ebdabd
ViewMTN: http://monotone.openembedded.org/revision/info/c7d233d13bec38f6add0756be85ac16f62ebdabd
Files:
1
packages/linux/compulab-pxa270_2.6.22.bb
packages/linux/compulab-pxa270-2.6.22
packages/linux/linux-2.6.22/cm-x270
packages/linux/linux-2.6.22
packages/linux/linux_2.6.22.bb
Diffs:

#
# mt diff -reaf98be5dcfba80d61fd7d46052a466eef0710b7 -rc7d233d13bec38f6add0756be85ac16f62ebdabd
#
# 
# 
# delete "packages/linux/compulab-pxa270_2.6.22.bb"
# 
# rename "packages/linux/compulab-pxa270-2.6.22"
#     to "packages/linux/linux-2.6.22/cm-x270"
# 
# add_dir "packages/linux/linux-2.6.22"
# 
# patch "packages/linux/linux_2.6.22.bb"
#  from [15c369e83250f745d423185a59b28e705bdcaeee]
#    to [f0f0a50acdeacf4a36a583128b72dc7eb877f72c]
# 
============================================================
--- packages/linux/linux_2.6.22.bb	15c369e83250f745d423185a59b28e705bdcaeee
+++ packages/linux/linux_2.6.22.bb	f0f0a50acdeacf4a36a583128b72dc7eb877f72c
@@ -1,8 +1,9 @@ DEFAULT_PREFERENCE_avr32 = "1"
 require linux.inc
 
 # Mark archs/machines that this kernel supports
 DEFAULT_PREFERENCE = "-1"
 DEFAULT_PREFERENCE_avr32 = "1"
+DEFAULT_PREFERENCE_cm-x270 = "1"
 
 PR = "r3"
 
@@ -11,3 +12,45 @@ SRC_URI_append_avr32 = "http://avr32linu
 	   "
 
 SRC_URI_append_avr32 = "http://avr32linux.org/twiki/pub/Main/LinuxPatches/linux-2.6.22.atmel.3.patch.bz2;patch=1"
+
+SRC_URI_append_cm-x270 = "\
+	file://0001-cm-x270-base2.patch;patch=1 \
+	file://0002-cm-x270-match-type.patch;patch=1 \
+	file://0003-cm-x270-ide.patch;patch=1 \
+	file://0004-cm-x270-it8152.patch;patch=1 \
+	file://0005-cm-x270-pcmcia.patch;patch=1 \
+	file://0006-ramdisk_load.patch;patch=1 \
+	file://0007-mmcsd_large_cards-r0.patch;patch=1 \
+	file://0008-cm-x270-nand-simplify-name.patch;patch=1"
+
+CMDLINE_cm-x270 = "console=${CMX270_CONSOLE_SERIAL_PORT},38400 monitor=8 bpp=16 mem=64M mtdparts=physmap-flash.0:256k(boot)ro,0x180000(kernel),-(root);cm-x270-nand:64m(app),-(data) rdinit=/sbin/init root=mtd3 rootfstype=jffs2"
+
+FILES_kernel-image_cm-x270 = ""
+
+python do_compulab_image() {
+	import os
+	import os.path
+	import struct
+
+	machine = bb.data.getVar('MACHINE', d, 1)
+	if machine == "cm-x270":
+	    deploy_dir = bb.data.getVar('DEPLOY_DIR_IMAGE', d, 1)
+	    kernel_file = os.path.join(deploy_dir, bb.data.expand('${KERNEL_IMAGE_BASE_NAME}', d) + '.bin')
+	    img_file = os.path.join(deploy_dir, bb.data.expand('${KERNEL_IMAGE_BASE_NAME}', d) + '.cmx270')
+
+	    fo = open(img_file, 'wb')
+
+	    image_data = open(kernel_file, 'rb').read()
+
+	    # first write size into first 4 bytes
+	    size_s = struct.pack('i', len(image_data))
+
+	    # truncate size if we are running on a 64-bit host
+	    size_s = size_s[:4]
+
+	    fo.write(size_s)
+	    fo.write(image_data)
+	    fo.close()
+}
+
+addtask compulab_image after do_deploy before do_package