[oe-commits] org.oe.dev merge of '80b5c8a3efa25ab2eb9325c08c68cc36f0d664d9'

[hrw commit]

merge of '80b5c8a3efa25ab2eb9325c08c68cc36f0d664d9'
     and '877bd2153580c3f0eb7238b370fb1ae786b7b992'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: d64b9d976248adce39d09fcf3354a47f0dfaffce
ViewMTN: http://monotone.openembedded.org/revision/info/d64b9d976248adce39d09fcf3354a47f0dfaffce
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
conf/machine/cm-x270.conf
packages/linux/linux_2.6.22.bb
packages/mplayer/files/pxa_configure.patch
packages/mplayer/mplayer_svn.bb
Diffs:

#
# mt diff -r80b5c8a3efa25ab2eb9325c08c68cc36f0d664d9 -rd64b9d976248adce39d09fcf3354a47f0dfaffce
#
# 
# 
# 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 "conf/machine/cm-x270.conf"
#  from [dc8a9f8d957f1124c4c5da27f0d66ff24fe7f9de]
#    to [62508fde56f36a27f0d164c04e2d9619501d5fd2]
# 
# patch "packages/linux/linux_2.6.22.bb"
#  from [15c369e83250f745d423185a59b28e705bdcaeee]
#    to [f0f0a50acdeacf4a36a583128b72dc7eb877f72c]
# 
============================================================
--- conf/machine/cm-x270.conf	dc8a9f8d957f1124c4c5da27f0d66ff24fe7f9de
+++ conf/machine/cm-x270.conf	62508fde56f36a27f0d164c04e2d9619501d5fd2
@@ -6,7 +6,7 @@ GUI_MACHINE_CLASS ?= "bigscreen"
 PREFERRED_VERSION_compulab-pxa270 = "2.6.22"
 GUI_MACHINE_CLASS ?= "bigscreen"
 
-PREFERRED_PROVIDER_virtual/kernel = "compulab-pxa270"
+PREFERRED_PROVIDER_virtual/kernel = "linux"
 PACKAGE_EXTRA_ARCHS = "armv4 armv5te"
 
 require conf/machine/include/tune-xscale.inc
============================================================
--- 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


#
# mt diff -r877bd2153580c3f0eb7238b370fb1ae786b7b992 -rd64b9d976248adce39d09fcf3354a47f0dfaffce
#
# 
# 
# patch "packages/mplayer/files/pxa_configure.patch"
#  from [93eea0c82165dba1555a9f1922bd276ba0da80d2]
#    to [8b3a65628f4f31876b7d2651580ceb83e9ef0cef]
# 
# patch "packages/mplayer/mplayer_svn.bb"
#  from [ef35057ee8e9aef0122d490fe9154954c594eb75]
#    to [74b353062db373f41fc56a8d073b1c5c19fdf347]
# 
============================================================
--- packages/mplayer/files/pxa_configure.patch	93eea0c82165dba1555a9f1922bd276ba0da80d2
+++ packages/mplayer/files/pxa_configure.patch	8b3a65628f4f31876b7d2651580ceb83e9ef0cef
@@ -25,11 +25,11 @@ Index: MPlayer-1.0rc1/configure
  
 +echocheck "PXA27x Overlay Support"
 +if test "$_pxa" = yes ; then
-+  _def_imageon='#define HAVE_PXA 1'
++  _def_pxa='#define HAVE_PXA 1'
 +  _vosrc="$_vosrc vo_pxa.c"
 +  _vomodules="pxa $_vomodules"
 +else
-+  _def_imageon='#undef HAVE_IMAGEON'
++  _def_pxa='#undef HAVE_IMAGEON'
 +  _novomodules="pxa $_novomodules"
 +fi
 +echores "$_pxa"
============================================================
--- packages/mplayer/mplayer_svn.bb	ef35057ee8e9aef0122d490fe9154954c594eb75
+++ packages/mplayer/mplayer_svn.bb	74b353062db373f41fc56a8d073b1c5c19fdf347
@@ -40,7 +40,7 @@ PV = "0.0+1.0rc1+svnr${SRCREV}"
 RREPLACES_${PN} = "mplayer-atty"
 
 PV = "0.0+1.0rc1+svnr${SRCREV}"
-PR = "r4"
+PR = "r5"
 DEFAULT_PREFERENCE = "-1"
 
 PARALLEL_MAKE = ""