qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-29 00:48:06 +02:00
Code

Some build fixes.

Browse Source
This commit is contained in:
Lars-Peter Clausen 2009-09-15 13:10:34 +02:00 committed by Xiangfu Liu
parent 4be762051b
commit 557e48bc8e
4 changed files with 37 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/xburst/config-2.6.31
View File

@ -144,6 +144,7 @@ CONFIG_HAVE_OPROFILE=y
CONFIG_HW_CONSOLE=y CONFIG_HW_CONSOLE=y
# CONFIG_HW_RANDOM is not set # CONFIG_HW_RANDOM is not set
# CONFIG_I2C is not set # CONFIG_I2C is not set
# CONFIG_IMAGE_CMDLINE_HACK is not set
CONFIG_INET_DIAG=y CONFIG_INET_DIAG=y
CONFIG_INET_TCP_DIAG=y CONFIG_INET_TCP_DIAG=y
CONFIG_INPUT=y CONFIG_INPUT=y
@ -188,7 +189,7 @@ CONFIG_LOGO=y
# CONFIG_LOGO_LINUX_CLUT224 is not set # CONFIG_LOGO_LINUX_CLUT224 is not set
# CONFIG_LOGO_LINUX_MONO is not set # CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set # CONFIG_LOGO_LINUX_VGA16 is not set
CONFIG_LOGO_OPENWRT_CLUT224 CONFIG_LOGO_OPENWRT_CLUT224=y
CONFIG_LZO_COMPRESS=y CONFIG_LZO_COMPRESS=y
CONFIG_LZO_DECOMPRESS=y CONFIG_LZO_DECOMPRESS=y
CONFIG_MAC80211_DEFAULT_PS_VALUE=0 CONFIG_MAC80211_DEFAULT_PS_VALUE=0
@ -252,7 +253,6 @@ CONFIG_PM=y
# CONFIG_PNX8550_STB810 is not set # CONFIG_PNX8550_STB810 is not set
CONFIG_PREEMPT=y CONFIG_PREEMPT=y
# CONFIG_PREEMPT_NONE is not set # CONFIG_PREEMPT_NONE is not set
# CONFIG_PROM_EMU is not set
CONFIG_RELAY=y CONFIG_RELAY=y
CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_SCHED_OMIT_FRAME_POINTER=y
# CONFIG_SCSI_DMA is not set # CONFIG_SCSI_DMA is not set

2
target/linux/xburst/files-2.6.31/arch/mips/jz4740/platform.c
View File

@ -263,7 +263,7 @@ static const uint32_t qi_lb60_keymap[] = {
KEY(6, 7, KEY_RIGHT), /* S57 */ KEY(6, 7, KEY_RIGHT), /* S57 */
#ifndef KEEP_UART_ALIVE #ifndef KEEP_UART_ALIVE
KEY(7, 0, KEY_QI_LEFTSHIFT), /* S58 */ KEY(7, 0, KEY_LEFTSHIFT), /* S58 */
KEY(7, 1, KEY_LEFTALT), /* S59 */ KEY(7, 1, KEY_LEFTALT), /* S59 */
KEY(7, 2, KEY_FN), /* S60 */ KEY(7, 2, KEY_FN), /* S60 */
#endif #endif

2
target/linux/xburst/patches-2.6.31/105-sound.patch
View File

@ -100,7 +100,7 @@ diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index bbc97fd..493e216 100644 index bbc97fd..493e216 100644
--- a/sound/soc/codecs/Kconfig --- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig
@@ -179,3 +179,15 @@ config SND_SOC_WM9712 @@ -179,3 +179,10 @@ config SND_SOC_WM9712
config SND_SOC_WM9713 config SND_SOC_WM9713
tristate tristate

53
target/linux/xburst/patches-2.6.31/410-soc-32bit-regs.patch
View File

@ -1,5 +1,5 @@
--- /opt/Projects/linux-2.6/sound/soc/soc-core.c 2009-09-02 16:48:38.000000000 +0200 --- a/sound/soc/soc-core.c 2009-09-02 16:48:38.000000000 +0200
+++ ./soc-core.c 2009-09-15 03:23:13.000000000 +0200 +++ b/sound/soc/soc-core.c 2009-09-15 03:23:13.000000000 +0200
@@ -500,8 +500,8 @@ @@ -500,8 +500,8 @@
if (cpu_dai->ops->hw_params) { if (cpu_dai->ops->hw_params) {
ret = cpu_dai->ops->hw_params(substream, params, cpu_dai); ret = cpu_dai->ops->hw_params(substream, params, cpu_dai);
@ -133,8 +133,8 @@
INIT_LIST_HEAD(&dai->list); INIT_LIST_HEAD(&dai->list);
mutex_lock(&client_mutex); mutex_lock(&client_mutex);
--- /opt/Projects/linux-2.6/sound/soc/soc-dapm.c 2009-09-02 16:48:38.000000000 +0200 --- a/sound/soc/soc-dapm.c 2009-09-02 16:48:38.000000000 +0200
+++ ./soc-dapm.c 2009-09-08 17:49:09.000000000 +0200 +++ b/sound/soc/soc-dapm.c 2009-09-08 17:49:09.000000000 +0200
@@ -268,7 +268,7 @@ @@ -268,7 +268,7 @@
static int dapm_update_bits(struct snd_soc_dapm_widget *widget) static int dapm_update_bits(struct snd_soc_dapm_widget *widget)
{ {
@ -211,19 +211,32 @@
int ret = 0; int ret = 0;
if (ucontrol->value.enumerated.item[0] > e->max - 1) if (ucontrol->value.enumerated.item[0] > e->max - 1)
218,221c218,221
< int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned short reg, --- a/include/sound/soc.h 2009-09-02 16:48:29.000000000 +0200
< unsigned short mask, unsigned short value); +++ b/include/sound/soc.h 2009-09-08 17:40:32.000000000 +0200
< int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned short reg, @@ -215,10 +215,10 @@
< unsigned short mask, unsigned short value); #endif
---
> int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned int reg, /* codec register bit access */
> unsigned int mask, unsigned int value); -int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned short reg,
> int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned int reg, - unsigned short mask, unsigned short value);
> unsigned int mask, unsigned int value); -int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned short reg,
495,496c495,496 - unsigned short mask, unsigned short value);
< unsigned short reg; +int snd_soc_update_bits(struct snd_soc_codec *codec, unsigned int reg,
< unsigned short reg2; + unsigned int mask, unsigned int value);
--- +int snd_soc_test_bits(struct snd_soc_codec *codec, unsigned int reg,
> unsigned int reg; + unsigned int mask, unsigned int value);
> unsigned int reg2;
int snd_soc_new_ac97_codec(struct snd_soc_codec *codec,
struct snd_ac97_bus_ops *ops, int num);
@@ -492,8 +492,8 @@
/* enumerated kcontrol */
struct soc_enum {
- unsigned short reg;
- unsigned short reg2;
+ unsigned int reg;
+ unsigned int reg2;
unsigned char shift_l;
unsigned char shift_r;
unsigned int max;