merge of '603b2d0c7e4ad80e5779bd3bbdb822331cc0ea2b'

     and '6ab53da82d157971966f5a17d0c29d54df22cac9'

1 files changed, 88 insertions, 127 deletions

diff --git a/packages/linux/linux-ezx_2.6.21.bb b/packages/linux/linux-ezx_2.6.21.bb
index 8b111a2c44..db561a7f0d 100644
--- a/packages/linux/linux-ezx_2.6.21.bb
+++ b/packages/linux/linux-ezx_2.6.21.bb
@@ -1,87 +1,110 @@
 DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and E680"
-SECTION = "kernel"
-AUTHOR = "Harald Welte and the OpenEZX Team <openezx-devel@lists.openezx.org>"
+AUTHOR = "The OpenEZX Team <openezx-devel@lists.openezx.org>"
 HOMEPAGE = "http://www.openezx.org"
-LICENSE = "GPL"
-DEPENDS += "quilt-native"
 EZX = "ezxdev"
-PR = "${EZX}-r6"
+PR = "${EZX}-r23"
 
-inherit kernel
+require linux.inc
+
+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://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 \
-	\
-	"
+    ${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 \
+    ${RPSRC}/lzo_kernel-r0.patch;patch=1 \
+    ${RPSRC}/lzo_jffs2-r0.patch;patch=1 \
+    ${RPSRC}/lzo_crypto-r1.patch;patch=1 \
+    ${RPSRC}/lzo_jffs2_lzomode-r0.patch;patch=1 \
+    ${RPSRC}/lzo_jffs2_sysfs-r0.patch;patch=1 \
+    ${RPSRC}/pxa_timerfix-r0.patch;patch=1 \
+    ${RPSRC}/pxa27x_overlay-r5.patch;patch=1 \
+    ${RPSRC}/pxa-linking-bug.patch;patch=1;status=unmergable \
+    ${RPSRC}/mmcsd_large_cards-r0.patch;patch=1;status=hack \
+    ${RPSRC}/mmcsd_no_scr_check-r0.patch;patch=1;status=hack \
+    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-pcap.patch;patch=1 \
+    file://patches/e680-pcap.patch;patch=1 \
+    file://patches/a1200-pcap.patch;patch=1 \
+    file://patches/e6-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/e6-mci.patch;patch=1 \
+    file://patches/pxa27x-udc-support.2.patch;patch=1 \
+    file://patches/ezx-emu.patch;patch=1 \
+    file://patches/ezx-eoc.patch;patch=1 \ 
+    file://patches/a1200-eoc.patch;patch=1 \
+    file://patches/e6-eoc.patch;patch=1 \
+    file://patches/a780-emu.patch;patch=1 \
+    file://patches/e680-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/a1200-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/e6-ts.patch;patch=1 \
+    file://patches/a780-flip.patch;patch=1 \
+    file://patches/e680-locksw.patch;patch=1 \
+    file://patches/a1200-flip.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/asoc-pxa-ssp.patch;patch=1 \
+    file://patches/asoc-fix-loopback.patch;patch=1 \
+    file://patches/ezx-asoc.patch;patch=1 \     
+    file://patches/mtdfix.patch;patch=1 \
+    file://patches/ezx-backlight.patch;patch=1 \
+    file://defconfig \
+    \
+    "
 
 S = "${WORKDIR}/linux-${PV}"
 
 
 ##############################################################
 # kernel image resides on a seperate flash partition (for now)
-#
-FILES_kernel-image = ""
-ALLOW_EMPTY  = "1"
+# But we can flash it from userspace (flash_unlock /dev/mtdX && flash_eraseall /dev/mtdX && flashcp /boot/zImage /dev/mtdX)
+# so lets make a package of it. What about a postinst that flashes the new kernel?
 
 COMPATIBLE_HOST = "arm.*-linux"
-COMPATIBLE_MACHINE = '(a780|e680|a1200)'
+COMPATIBLE_MACHINE = '(a780|e680|a1200|rorkre2|rokre6)'
 
 # For now the code for serial console is disabled in compress.c
-#CMDLINE_CON = "console=ttyS2,115200n8 console=tty1 noinitrd"
-CMDLINE_CON = "console=tty1 noinitrd"
+#CMDLINE_CON = "console=ttyS2,115200n8 console=tty1 "
+CMDLINE_CON = "console=tty1 "
 
-CMDLINE_ROOT = "root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=5"
-# uncomment if you want to boot over NFS
-#CMDLINE_ROOT = "root=/dev/nfs nfsroot=192.168.1.10:/export/opie-image rootdelay=5 3"
-# uncomment to enable dyntick
+CMDLINE_ROOT = "root=/dev/mmcblk0p2 rootfstype=ext2 rootdelay=5"
+CMDLINE_NFSROOT = "root=/dev/nfs rootfstype=nfs nfsroot=192.168.0.200:/export/ezx-image rootdelay=5 "
+# Uncomment to enable dyntick
 #CMDLINE_OTHER = "dyntick=enable"
 CMDLINE_DEBUG = '${@base_conditional("DISTRO_TYPE", "release", "quiet", "debug",d)}'
-CMDLINE_IP = "ip=192.168.1.2:192.168.1.10:192.168.1.10:255.255.255.0:ezx:usb0:off"
-CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG} mem=32M@0xA0000000 mem=16M@0xAC000000"
+CMDLINE_IP = "ip=192.168.0.202:192.168.0.200:192.168.0.200:255.255.255.0"
+CMDLINE_MEM = "mem=32M@0xA0000000 mem=16M@0xAC000000"
+CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG} ${CMDLINE_MEM}"
+# Uncomment to use root-over-nfs-over-usb
+#CMDLINE_NFSROOT_USB = "${CMDLINE_CON} ${CMDLINE_NFSROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG} ${CMDLINE_MEM}"
+
+# 1024x1024 once was the maximum kernel size for boot-over-usb -- is it still?
+#KERNEL_IMAGE_MAXSIZE = "1294336"
 
 ###############################################################
 # module configs specific to this kernel
@@ -89,65 +112,3 @@ CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDL
 #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}/patches/defconfig-${MACHINE} ]; then
-		die "No default configuration for ${MACHINE} available."
-	fi
-
-	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
-
-	if [ "${TARGET_OS}" == "linux-gnueabi" -o  "${TARGET_OS}" == "linux-uclibcgnueabi" ]; then
-		echo "CONFIG_AEABI=y"                   >> ${S}/.config
-		echo "CONFIG_OABI_COMPAT=y"             >> ${S}/.config
-	else
-		echo "# CONFIG_AEABI is not set"        >> ${S}/.config
-		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' \
-	    -e '/CONFIG_MTD_MTDRAM_SA1100=/d' \
-	    -e '/CONFIG_MTDRAM_TOTAL_SIZE=/d' \
-	    -e '/CONFIG_MTDRAM_ERASE_SIZE=/d' \
-	    -e '/CONFIG_MTDRAM_ABS_POS=/d' \
-	    -e '/CONFIG_LOGO=/d' \
-	    -e '/CONFIG_LOGO_LINUX_CLUT224=/d' \
-	    '${WORKDIR}/patches/defconfig-${MACHINE}' >>'${S}/.config'
-
-	yes '' | oe_runmake oldconfig
-}
-
-###############################################################
-# check the kernel is below the 1024*1024 byte limit for the boot-over usb
-#
-do_compile_append() {
-	size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'`
-	if [ $size -ge 1294336 ]; then
-		rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
-		echo "Size is $size"
-		echo  "This kernel is too big for your EZX Phone. Please reduce the size of the kernel by making more of it modular."
-	fi
-}
-
-###############################################################
-# put into deploy directory
-#
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        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_package after do_install