[oe-commits] Martin Jansa : linux-openmoko-2.6.31: enable sound in config, add workaround for gcc bug

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: c8d0f8fc2a7322c068af10af68a622916b9ee007
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c8d0f8fc2a7322c068af10af68a622916b9ee007

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sat Nov  7 20:53:33 2009 +0100

linux-openmoko-2.6.31: enable sound in config, add workaround for gcc bug

* Nasty workaround when gcc-4.4.2 emits the reference to uldivmod, from
  do_div but then optimizes it out and later linking fails

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 ...build-with-gcc-4.4.2-which-works-ok-with-.patch |   27 ++++++++++++++++++++
 .../linux/linux-openmoko-2.6.31/gta02_defconfig    |   19 ++++++++++---
 recipes/linux/linux-openmoko-2.6.31_git.bb         |    1 +
 3 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/recipes/linux/linux-openmoko-2.6.31/0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch b/recipes/linux/linux-openmoko-2.6.31/0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch
new file mode 100644
index 0000000..716012e
--- /dev/null
+++ b/recipes/linux/linux-openmoko-2.6.31/0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch
@@ -0,0 +1,27 @@
+From 1afd5634be7580987f38af6334ff5795ad836470 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa at gmail.com>
+Date: Sat, 7 Nov 2009 20:33:06 +0100
+Subject: [PATCH] wm8753: fix build with gcc-4.4.2, which works ok with 4.1.2
+
+---
+ sound/soc/codecs/wm8753.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c
+index f753bc1..0da8a88 100644
+--- a/sound/soc/codecs/wm8753.c
++++ b/sound/soc/codecs/wm8753.c
+@@ -724,7 +724,9 @@ static void pll_factors(struct _pll_div *pll_div, unsigned int target,
+ 	Nmod = target % source;
+ 	Kpart = FIXED_PLL_SIZE * (long long)Nmod;
+ 
+-	do_div(Kpart, source);
++	// with this, gcc-4.4.2 emits the reference to uldivmod, but then optimizes it out
++	//do_div(Kpart, source);
++	__do_div_asm(Kpart, source);
+ 
+ 	K = Kpart & 0xFFFFFFFF;
+ 
+-- 
+1.6.5.2
+
diff --git a/recipes/linux/linux-openmoko-2.6.31/gta02_defconfig b/recipes/linux/linux-openmoko-2.6.31/gta02_defconfig
index c8e179e..21e5445 100644
--- a/recipes/linux/linux-openmoko-2.6.31/gta02_defconfig
+++ b/recipes/linux/linux-openmoko-2.6.31/gta02_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.31
-# Sat Nov  7 18:04:10 2009
+# Sat Nov  7 17:23:37 2009
 #
 CONFIG_ARM=y
 CONFIG_HAVE_PWM=y
@@ -55,7 +55,8 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=18
 # CONFIG_GROUP_SCHED is not set
 # CONFIG_CGROUPS is not set
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
+CONFIG_SYSFS_DEPRECATED=y
+CONFIG_SYSFS_DEPRECATED_V2=y
 # CONFIG_RELAY is not set
 CONFIG_NAMESPACES=y
 # CONFIG_UTS_NS is not set
@@ -332,7 +333,7 @@ CONFIG_ALIGNMENT_TRAP=y
 #
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="unused -- bootloader passes ATAG list debug "
+CONFIG_CMDLINE="unused -- bootloader passes ATAG list"
 # CONFIG_XIP_KERNEL is not set
 # CONFIG_KEXEC is not set
 
@@ -1065,7 +1066,10 @@ CONFIG_FONT_6x11=y
 # CONFIG_FONT_SUN8x16 is not set
 # CONFIG_FONT_SUN12x22 is not set
 # CONFIG_FONT_10x18 is not set
-# CONFIG_LOGO is not set
+CONFIG_LOGO=y
+# CONFIG_LOGO_LINUX_MONO is not set
+# CONFIG_LOGO_LINUX_VGA16 is not set
+# CONFIG_LOGO_LINUX_CLUT224 is not set
 CONFIG_SOUND=m
 CONFIG_SOUND_OSS_CORE=y
 CONFIG_SND=m
@@ -1094,9 +1098,14 @@ CONFIG_SND_SEQUENCER_OSS=y
 # CONFIG_SND_SPI is not set
 # CONFIG_SND_USB is not set
 CONFIG_SND_SOC=m
-# CONFIG_SND_S3C24XX_SOC is not set
+CONFIG_SND_S3C24XX_SOC=m
+CONFIG_SND_S3C24XX_SOC_I2S=m
+CONFIG_SND_S3C24XX_SOC_NEO1973_WM8753=m
+# CONFIG_SND_S3C24XX_SOC_LN2440SBC_ALC650 is not set
+# CONFIG_SND_S3C24XX_SOC_S3C24XX_UDA134X is not set
 CONFIG_SND_SOC_I2C_AND_SPI=m
 # CONFIG_SND_SOC_ALL_CODECS is not set
+CONFIG_SND_SOC_WM8753=m
 # CONFIG_SOUND_PRIME is not set
 CONFIG_HID_SUPPORT=y
 CONFIG_HID=y
diff --git a/recipes/linux/linux-openmoko-2.6.31_git.bb b/recipes/linux/linux-openmoko-2.6.31_git.bb
index 7332df1..a7e6c7b 100644
--- a/recipes/linux/linux-openmoko-2.6.31_git.bb
+++ b/recipes/linux/linux-openmoko-2.6.31_git.bb
@@ -12,6 +12,7 @@ PR = "r0"
 
 SRC_URI = "\
   git://git.openmoko.org/git/kernel.git;protocol=git;branch=om-2.6.31 \
+  file://0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch;patch=1 \
   file://gta02_defconfig \
 "
 S = "${WORKDIR}/git"