3 files changed, 31 insertions, 121 deletions
diff --git a/packages/linux/compulab-pxa270_2.6.16.bb b/packages/linux/compulab-pxa270_2.6.16.bb
index 6e09281546..043fc22777 100644
--- a/packages/linux/compulab-pxa270_2.6.16.bb
+++ b/packages/linux/compulab-pxa270_2.6.16.bb
@@ -1,7 +1,7 @@
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for the Compulab PXA270 system"
 LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
 
 # Note, the compulab package contains a binary NAND driver that is not
 # EABI compatible
@@ -32,25 +32,38 @@ do_deploy() {
 	KNAME=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin
         install -d ${DEPLOY_DIR_IMAGE}
         install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${KNAME}
-	# Create an image file that has the size prepended (used by cm-x270 BL)
-	# The following can only be done on a little endian machine
-	# the following does not work on all computers as it requires a recent
-	# version of coreutils (>= 6.0).  We will eventually replace the following
-	# with python code.
-	#size=$(stat --printf=%s ${KNAME})
-	#size_=$(printf '\%03o'\
-	#$((size & 0x000000FF))\
-	#$((size>>8 & 0x000000FF))\
-	#$((size>>16 & 0x000000FF))\
-	#$((size>>24 & 0x000000FF)))
-	#size_=${size_}'\c'
-	#echo -e $size_ > ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.img
-	#cat ${KNAME} >> ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.img
 }
 
+python do_compulab_image() {
+	import os
+	import os.path
+	import struct
+
+	deploy_dir = bb.data.getVar('DEPLOY_DIR_IMAGE', d, 1)
+	kernel_name = os.path.join(deploy_dir, bb.data.expand('${KERNEL_IMAGETYPE}-${MACHINE}.bin', d))
+
+	img_file = os.path.join(deploy_dir, 'zImage-compulab-pxa270.img')
+
+	fo = open(img_file, 'wb')
+
+	image_data = open(kernel_name, '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()
+}
+
+
 do_deploy[dirs] = "${S}"
 
 addtask deploy before do_build after do_compile
+addtask compulab_image before do_build after do_deploy
 
 COMPATIBLE_MACHINE = "compulab-pxa270"
 
diff --git a/packages/linux/linux-ezx-2.6.20.7/defconfig-a780 b/packages/linux/linux-ezx-2.6.20.7/defconfig-a780
index 04735c6136..a9300a61f5 100644
--- a/packages/linux/linux-ezx-2.6.20.7/defconfig-a780
+++ b/packages/linux/linux-ezx-2.6.20.7/defconfig-a780
@@ -1,88 +1,4 @@
-
-
-
-
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"
-"http://www.w3.org/TR/REC-html40/loose.dtd">
-<!-- ViewCVS - http://viewcvs.sourceforge.net/
-by Greg Stein - mailto:gstein@lyra.org -->
-<html>
-<head>
-<title>svn.openezx.org Repository - markup - svn.openezx.org: branches/kernel-2.6.20.7-patches/defconfig-a780</title>
-<meta name="generator" content="ViewCVS 1.0-dev">
-<link rel="stylesheet" href="/viewcvs/styles.css" type="text/css">
-</head>
-<body>
-<div class="vc_navheader">
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td align="left"><a href="/cgi-bin/viewcvs.cgi/?rev=1981#dirlist">[svn.openezx.org]</a> / <a href="/cgi-bin/viewcvs.cgi/branches/?rev=1981#dirlist">branches</a> / <a href="/cgi-bin/viewcvs.cgi/branches/kernel-2.6.20.7-patches/?rev=1981#dirlist">kernel-2.6.20.7-patches</a> / defconfig-a780</td>
-<td align="right">
-
-<form method=get action="/cgi-bin/viewcvs.cgi/">
-
-<b>Project Root:</b>
-<select name="root" onchange="submit()">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<optgroup label="CVS Repositories"><option>cvs</option></optgroup>
-
-
-<optgroup label="Subversion Repositories"><option selected>svn.openezx.org</option></optgroup>
-
-</select>
-<input type=submit value="Go">
-</form>
-
-</td>
-</tr>
-</table>
-</div>
-<h1>svn.openezx.org: branches/kernel-2.6.20.7-patches/defconfig-a780</h1>
-
-<div class="vc_summary">
-File: <a href="/cgi-bin/viewcvs.cgi/?rev=1981#dirlist">[svn.openezx.org]</a> / <a href="/cgi-bin/viewcvs.cgi/branches/?rev=1981#dirlist">branches</a> / <a href="/cgi-bin/viewcvs.cgi/branches/kernel-2.6.20.7-patches/?rev=1981#dirlist">kernel-2.6.20.7-patches</a> / defconfig-a780
-(<a href="/cgi-bin/viewcvs.cgi/*checkout*/branches/kernel-2.6.20.7-patches/defconfig-a780?rev=1981"><b>download</b></a>)
-
-<br>
-
-Revision: <b>1981</b>,
-<i>Sun Apr 22 20:32:25 2007 UTC</i> (16 hours, 45 minutes ago) by <i>wyrm</i>
-
-
-
-
-
-<br>File size: 25011 byte(s)
-
-
-<pre class="vc_log">latest .config
-
-</pre>
-
-</div>
-<pre>#
+#
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.20.7
 # Sun Apr 22 15:03:36 2007
@@ -434,7 +350,7 @@ CONFIG_FW_LOADER=m
 # CONFIG_SYS_HYPERVISOR is not set
 
 #
-# Connector - unified userspace &lt;-&gt; kernelspace linker
+# Connector - unified userspace <-> kernelspace linker
 #
 CONFIG_CONNECTOR=m
 
@@ -1331,22 +1247,3 @@ CONFIG_LIBCRC32C=m
 CONFIG_ZLIB_INFLATE=y
 CONFIG_PLIST=y
 CONFIG_IOMAP_COPY=y
-</pre>
-
-<hr noshade>
-<table width="100%" border="0" cellpadding="0" cellspacing="0">
-<tr>
-<td align="left">
-<address><a href="mailto:svn-admin@openezx.org">CVS Admin</a></address><br />
-Powered by <a href="http://viewcvs.sourceforge.net/">ViewCVS 1.0-dev</a>
-</td>
-<td align="right">
-<img src="/doc/viewcvs/images/logo.png" alt="(Powered by ViewCVS)" border="0"
-width="128" height="48" /><br />
-<h3><a target="_blank" href="/viewcvs/help_rootview.html">ViewCVS and CVS Help</a></h3>
-</td>
-</tr>
-</table>
-</body>
-</html>
-
diff --git a/packages/linux/linux-rp-2.6.20/defconfig-collie b/packages/linux/linux-rp-2.6.20/defconfig-collie
index b0603a8408..945f2fb39c 100644
--- a/packages/linux/linux-rp-2.6.20/defconfig-collie
+++ b/packages/linux/linux-rp-2.6.20/defconfig-collie
@@ -1410,7 +1410,7 @@ CONFIG_USB_GADGET=y
 # MMC/SD Card support
 #
 CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_DEBUG=y
 CONFIG_MMC_BLOCK=m
 # CONFIG_MMC_TIFM_SD is not set
 CONFIG_MMC_SPI=m