merge of '45fb4fa94d52a65c3a3fa636c6122139173dfa8d'

[vuplus_openembedded] / packages / linux / linux-ezx_2.6.16.13.bb

diff --git a/packages/linux/linux-ezx_2.6.16.13.bb b/packages/linux/linux-ezx_2.6.16.13.bb
index f7f9704..58d98c3 100644 (file)
--- a/packages/linux/linux-ezx_2.6.16.13.bb
+++ b/packages/linux/linux-ezx_2.6.16.13.bb
@@ -2,11 +2,10 @@ DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and
 SECTION = "kernel"
 AUTHOR = "Harald Welte and the OpenEZX Team <openezx-devel@lists.openezx.org>"
 HOMEPAGE = "http://www.openezx.org"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@vanille.de>"
 LICENSE = "GPL"
 DEPENDS += "quilt-native"
-EZX = "ezx6"
-PR = "${EZX}-r11"
+EZX = "ezx7"
+PR = "${EZX}-r1"
 
 inherit kernel
 
@@ -16,33 +15,13 @@ RPSRC = "http://www.rpsys.net/openzaurus/patches/archive"
 ##############################################################
 # source and patches
 #
-SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
-          http://people.openezx.org/stefan/patches/patches-2.6.16-2.6.16.13-exz6-symlink-fix.tar.bz2 \
-           \
-           ${RPSRC}/led_core-r15.patch;patch=1 \
-           ${RPSRC}/led_triggers-r14.patch;patch=1 \
-           ${RPSRC}/led_trig_timer-r8.patch;patch=1 \
-           ${RPSRC}/led_trig_sharpsl_pm-r5.patch;patch=1 \
-           ${RPSRC}/led_zaurus-r10.patch;patch=1 \
-           ${RPSRC}/led_locomo-r7.patch;patch=1 \
-           ${RPSRC}/led_ixp4xx-r2.patch;patch=1 \
-           ${RPSRC}/led_tosa-r5.patch;patch=1 \
-           ${RPSRC}/led_ide-r6.patch;patch=1 \
-           ${RPSRC}/led_nand-r3.patch;patch=1 \
-           ${RPSRC}/corgi_bl_cleanup-r3.patch;patch=1 \
-           ${RPSRC}/corgi_bl_generic-r3.patch;patch=1 \
-           ${RPSRC}/backlight_sysfs_fix-r0.patch;patch=1 \
-           \
-          file://touchscreen-fix-r0.patch;patch=1 \
-           \
-           file://e680-disable-boomer-HACK.patch;patch=1 \
-           \
-           file://e680-leds-r1.patch;patch=1 \
-           file://a780-leds-r0.patch;patch=1 \
-           file://ezx-backlight-r1.patch;patch=1 \
-           file://e680-fix-keypad.patch;patch=1 \
-           file://pxakbd-fix-directkeys.patch;patch=1 \
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
+           http://people.openezx.org/stefan/patches/patches-2.6.16-2.6.16.13-ezx7.tar.bz2 \
            \
+           file://sa1100-rtc-gcc4.diff;patch=1 \
+          file://pxa-serial-gcc4.diff;patch=1 \
+          \
+          file://logo_linux_clut224.ppm \
            file://defconfig-a780 \
            file://defconfig-e680"
 S = "${WORKDIR}/linux-2.6.16"
@@ -51,7 +30,7 @@ S = "${WORKDIR}/linux-2.6.16"
 # kernel image resides on a seperate flash partition (for now)
 #
 FILES_kernel-image = ""
-ALLOW_EMPTY = 1
+ALLOW_EMPTY  = "1"
 
 COMPATIBLE_HOST = "arm.*-linux"
 COMPATIBLE_MACHINE = '(a780|e680)'
@@ -64,7 +43,7 @@ CMDLINE_ROOT = "root=/dev/mmcblk0p1 rootfstype=ext3 rootdelay=5"
 #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"
+CMDLINE = "${CMDLINE_CON} ${CMDLINE_ROOT} ${CMDLINE_IP} ${CMDLINE_ROTATE} ${CMDLINE_OTHER} ${CMDLINE_DEBUG} mem=32M@0xA0000000 mem=16M@0xAC000000"
 
 ###############################################################
 # module configs specific to this kernel
@@ -78,7 +57,7 @@ do_ezxpatch() {
 }
 
 do_configure() {
-       mv ${S}/.config harald.config
+       install -m 0644 ${WORKDIR}/logo_linux_clut224.ppm drivers/video/logo/logo_linux_clut224.ppm
 
        if [ ! -e ${WORKDIR}/defconfig-${MACHINE} ]; then
                die "No default configuration for ${MACHINE} available."
@@ -86,7 +65,7 @@ do_configure() {
 
        echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
 
-       if [ "${TARGET_OS}" == "linux-gnueabi" ]; then
+       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