merge of 'a9d59f7c5db704e36d7f7dbda87b750cabbbc775'

     and 'fcf3721db5cf2d3c669e8d3d36cd3ca4df792f6f'

1 files changed, 63 insertions, 47 deletions

diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb
index 80c0122504..8b111a2c44 100644
--- a/packages/linux/linux-ezx_2.6.21.bb
+++ b/packages/linux/linux-ezx_2.6.21.bb
@@ -4,52 +4,59 @@ AUTHOR = "Harald Welte and the OpenEZX Team <openezx-devel@lists.openezx.org>"
 HOMEPAGE = "http://www.openezx.org"
 LICENSE = "GPL"
 DEPENDS += "quilt-native"
-EZX = "ezx0"
-PR = "${EZX}-r5"
+EZX = "ezxdev"
+PR = "${EZX}-r6"
 
 inherit kernel
 
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/linux-ezx"
-RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
-
 ##############################################################
 # source and patches
 #
 SRC_URI = " \
-        ${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
-	file://ezx-core.patch;patch=1 \
-	file://ezx-bp.patch;patch=1 \
-	file://ezx-pm.patch;patch=1 \
-	file://ezx-pcap.patch;patch=1 \
-	file://a780-mci.patch;patch=1 \
- 	file://e680-mci.patch;patch=1 \
-	file://pxa27x-udc-support.2.patch;patch=1 \
-	file://ezx-emu.patch;patch=1 \
-	file://ezx-mtd-map.patch;patch=1 \
-	file://ezx-serial-bug-workaround.patch;patch=1 \
-	file://pxa-kbd.patch;patch=1 \
-	file://a780-kbd.patch;patch=1 \
-        file://e680-kbd.patch;patch=1 \
-	file://pcap-ts.patch;patch=1 \
-	file://ezx-backlight.patch;patch=1 \
-	file://a780-flip.patch;patch=1 \
-	file://e680-locksw.patch;patch=1 \
-        file://a780-leds.patch;patch=1 \
-	file://e680-leds.patch;patch=1 \
-	file://a780-vibrator.patch;patch=1 \
-	file://mux_cli.patch;patch=1 \
-	file://mux-fix.patch;patch=1 \
-	file://mux-fix-init-errorpath.patch;patch=1 \
-	file://mux-remove-flipbuffers.patch;patch=1 \
-	file://mux-remove-get_halted_bit.patch;patch=1 \
-	file://mux-remove-usbh_finished_resume.patch;patch=1 \
-	file://mux-fix-makefile.patch;patch=1 \
-	file://mux-fix-tty-driver.patch;patch=1 \
-	file://mux-linux-2.6.21-fix.patch;patch=1 \
-        file://logo_linux_clut224.ppm \
-        file://defconfig-a780 \
-        file://defconfig-e680 \
-       "
+	${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+	file://logo_linux_clut224.ppm \
+	\
+	file://patches/patch-2.6.21.4;patch=1 \
+	file://patches/ezx-core.patch;patch=1 \
+	file://patches/ezx-bp.patch;patch=1 \
+	file://patches/ezx-pm.patch;patch=1 \
+	file://patches/ezx-pcap.patch;patch=1 \
+	file://patches/a780-mci.patch;patch=1 \
+	file://patches/e680-mci.patch;patch=1 \
+	file://patches/a1200-mci.patch;patch=1 \
+	file://patches/pxa27x-udc-support.2.patch;patch=1 \
+	file://patches/ezx-emu.patch;patch=1 \
+	file://patches/ezx-mtd-map.patch;patch=1 \
+	file://patches/ezx-serial-bug-workaround.patch;patch=1 \
+	file://patches/pxa-kbd.patch;patch=1 \
+	file://patches/a780-kbd.patch;patch=1 \
+	file://patches/e680-kbd.patch;patch=1 \
+	file://patches/pcap-ts.patch;patch=1 \
+	file://patches/a780-ts.patch;patch=1 \
+	file://patches/e680-ts.patch;patch=1 \
+	file://patches/a1200-ts.patch;patch=1 \
+	file://patches/ezx-backlight.patch;patch=1 \
+	file://patches/a780-flip.patch;patch=1 \
+	file://patches/e680-locksw.patch;patch=1 \
+	file://patches/a780-leds.patch;patch=1 \
+	file://patches/e680-leds.patch;patch=1 \
+	file://patches/a780-vibrator.patch;patch=1 \
+	file://patches/mux_cli.patch;patch=1 \
+	file://patches/mux-fix.patch;patch=1 \
+	file://patches/mux-fix-init-errorpath.patch;patch=1 \
+	file://patches/mux-remove-flipbuffers.patch;patch=1 \
+	file://patches/mux-remove-get_halted_bit.patch;patch=1 \
+	file://patches/mux-remove-usbh_finished_resume.patch;patch=1 \
+	file://patches/mux-fix-makefile.patch;patch=1 \
+	file://patches/mux-fix-tty-driver.patch;patch=1 \
+	file://patches/mux-linux-2.6.21-fix.patch;patch=1 \
+	file://patches/defconfig-a1200 \
+	file://patches/defconfig-a780 \
+	file://patches/defconfig-e2 \
+	file://patches/defconfig-e6 \
+	file://patches/defconfig-e680 \
+	\
+	"
 
 S = "${WORKDIR}/linux-${PV}"
 
@@ -61,7 +68,7 @@ FILES_kernel-image = ""
 ALLOW_EMPTY  = "1"
 
 COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = '(a780|e680)'
+COMPATIBLE_MACHINE = '(a780|e680|a1200)'
 
 # For now the code for serial console is disabled in compress.c
 #CMDLINE_CON = "console=ttyS2,115200n8 console=tty1 noinitrd"
@@ -79,13 +86,13 @@ CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDL
 ###############################################################
 # module configs specific to this kernel
 #
-module_autoload_pxaficp_ir = "pxaficp_ir"
-module_autoload_snd-pcm-oss = "snd-pcm-oss"
+#module_autoload_pxaficp_ir = "pxaficp_ir"
+#module_autoload_snd-pcm-oss = "snd-pcm-oss"
 
 do_configure() {
 	install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
 
-	if [ ! -e ${WORKDIR}/defconfig-${MACHINE} ]; then
+	if [ ! -e ${WORKDIR}/patches/defconfig-${MACHINE} ]; then
 		die "No default configuration for ${MACHINE} available."
 	fi
 
@@ -99,6 +106,13 @@ do_configure() {
 		echo "# CONFIG_OABI_COMPAT is not set"  >> ${S}/.config
 	fi
 
+	#
+	# Logo configuration
+	#
+	echo "CONFIG_LOGO=y"			>> ${S}/.config
+	echo "CONFIG_LOGO_LINUX_CLUT224=y"	>> ${S}/.config
+
+
 	sed -e '/CONFIG_AEABI/d' \
 	    -e '/CONFIG_OABI_COMPAT=/d' \
 	    -e '/CONFIG_CMDLINE=/d' \
@@ -106,7 +120,9 @@ do_configure() {
 	    -e '/CONFIG_MTDRAM_TOTAL_SIZE=/d' \
 	    -e '/CONFIG_MTDRAM_ERASE_SIZE=/d' \
 	    -e '/CONFIG_MTDRAM_ABS_POS=/d' \
-	    '${WORKDIR}/defconfig-${MACHINE}' >>'${S}/.config'
+	    -e '/CONFIG_LOGO=/d' \
+	    -e '/CONFIG_LOGO_LINUX_CLUT224=/d' \
+	    '${WORKDIR}/patches/defconfig-${MACHINE}' >>'${S}/.config'
 
 	yes '' | oe_runmake oldconfig
 }
@@ -128,10 +144,10 @@ do_compile_append() {
 #
 do_deploy() {
         install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
-        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${MACHINE}.tgz -C ${D} lib
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}-${DATETIME}.tgz -C ${D} lib
 }
 
 do_deploy[dirs] = "${S}"
 
-addtask deploy before do_populate_staging after do_package
+addtask deploy before do_package after do_install