ep93xx 2.6.16: apply eabi enums patch

diff --git a/packages/linux/ep93xx-kernel/eabi-enums.patch b/packages/linux/ep93xx-kernel/eabi-enums.patch
new file mode 100644 (file)
index 0000000..9e5e9ec
--- /dev/null
+++ b/packages/linux/ep93xx-kernel/eabi-enums.patch
@@ -0,0 +1,16 @@
+Index: linux-2.6.16/arch/arm/Makefile
+===================================================================
+--- linux-2.6.16.orig/arch/arm/Makefile        2006-03-20 05:53:29.000000000 +0000
++++ linux-2.6.16/arch/arm/Makefile     2006-04-24 20:10:27.000000000 +0100
+@@ -57,7 +57,7 @@
+ tune-$(CONFIG_CPU_V6)         :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)
+ 
+ ifeq ($(CONFIG_AEABI),y)
+-CFLAGS_ABI    :=-mabi=aapcs -mno-thumb-interwork
++CFLAGS_ABI    :=-mabi=aapcs-linux -mno-thumb-interwork
+ else
+ CFLAGS_ABI    :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,)
+ endif
+
+
+

diff --git a/packages/linux/ep93xx-kernel_2.6.16.bb b/packages/linux/ep93xx-kernel_2.6.16.bb
index a472e93..068b967 100644 (file)
--- a/packages/linux/ep93xx-kernel_2.6.16.bb
+++ b/packages/linux/ep93xx-kernel_2.6.16.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Linux Kernel for Cirrus Logic ep39xx compatible machines"
 SECTION = "kernel"
 MAINTAINER = "Koen Kooi <koen@dominion.kabel.utwente.nl>"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 COMPATIBLE_MACHINE = "ep93xx"
 
@@ -11,6 +11,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
           http://cowebs.contec.at/ep93xx/EP93XX_Framebuffer1.patch;patch=1 \
           http://cowebs.contec.at/ep93xx/EP93XX_Framebuffer1_registers.patch;patch=1 \
           http://cowebs.contec.at/ep93xx/EP93XX_Framebuffer1_registers_raster.patch;patch=1 \ 
+          file://eabi-enums.patch;patch=1 \
            file://defconfig \
                   "
 
@@ -21,8 +22,28 @@ inherit kernel
 KERNEL_IMAGETYPE = "zImage"
 
 do_configure() {
-               install -m 644 ${WORKDIR}/defconfig ${S}/.config
-               make ARCH=arm oldconfig
+        rm -f ${S}/.config
+        
+        if [ ! -e ${WORKDIR}/defconfig ]; then
+                die "No default configuration for ${MACHINE} available."
+        fi
+
+        
+        if [ "${TARGET_OS}" == "linux-gnueabi" ]; 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
+        
+        sed -e '/CONFIG_AEABI/d' \
+            -e '/CONFIG_OABI_COMPAT=/d' \
+            '${WORKDIR}/defconfig' >>'${S}/.config'
+        
+        yes '' | oe_runmake oldconfig
+
+
 }
 
 do_deploy() {