[Armadeus-commitlog] SF.net SVN: armadeus: [640] trunk/buildroot
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus: [640] trunk/buildroot
|
From: <jo...@us...> - 2007-09-11 20:41:26
|
Revision: 640
http://armadeus.svn.sourceforge.net/armadeus/?rev=640&view=rev
Author: jorasse
Date: 2007-09-11 13:41:29 -0700 (Tue, 11 Sep 2007)
Log Message:
-----------
[alsa-driver] commited build chain but audio driver still unusable
Modified Paths:
--------------
trunk/buildroot/package/alsa-driver/alsa-driver-armadeus-add-tsc2102.patch
trunk/buildroot/package/alsa-driver/alsa-driver.mk
trunk/buildroot/target/device/armadeus/apf9328/linux-2.6.18.1.config
trunk/buildroot/target/device/armadeus/rootfs/device_table.txt
Added Paths:
-----------
trunk/buildroot/package/alsa-driver/depmod.pl
Removed Paths:
-------------
trunk/buildroot/package/alsa-driver/alsa-driver-armadeus-rules.patch
Modified: trunk/buildroot/package/alsa-driver/alsa-driver-armadeus-add-tsc2102.patch
===================================================================
--- trunk/buildroot/package/alsa-driver/alsa-driver-armadeus-add-tsc2102.patch 2007-09-07 21:50:01 UTC (rev 639)
+++ trunk/buildroot/package/alsa-driver/alsa-driver-armadeus-add-tsc2102.patch 2007-09-11 20:41:29 UTC (rev 640)
@@ -1,25 +1,35 @@
-diff -urN -X linux-2.6.18.1/Documentation/dontdiff alsa-driver-1.0.14/acinclude.m4 alsa-driver-1.0.14.mod/acinclude.m4
---- alsa-driver-1.0.14/acinclude.m4 2007-06-04 09:28:55.000000000 +0200
-+++ alsa-driver-1.0.14.mod/acinclude.m4 2007-08-06 20:08:44.000000000 +0200
-@@ -186,6 +186,7 @@
+--- alsa-driver-1.0.14.ref/acinclude.m4 2007-06-04 09:28:55.000000000 +0200
++++ alsa-driver-1.0.14/acinclude.m4 2007-09-09 22:53:57.000000000 +0200
+@@ -186,6 +186,8 @@ AC_DEFUN([ALSA_TOPLEVEL_INIT], [
CONFIG_SND_AOA_SOUNDBUS_I2S=""
CONFIG_ARM=""
CONFIG_SND_SA11XX_UDA1341=""
++ CONFIG_SND_IMX_SSI=""
+ CONFIG_SND_IMX_TSC2102=""
CONFIG_ARCH_SA1100=""
CONFIG_L3=""
CONFIG_SND_ARMAACI=""
-@@ -1962,6 +1963,18 @@
+@@ -299,7 +301,7 @@ AC_ARG_WITH(cards,
+ [ usb-usx2y, usb-caiaq, vxpocket, pdaudiocf, ]
+ [ sun-amd7930, sun-cs4231, sun-dbri, harmony, soc, ]
+ [ at91-soc, at91-soc-eti-b1-wm8731, pxa2xx-soc, ]
+- [ pxa2xx-soc-corgi, pxa2xx-soc-spitz, ]
++ [ pxa2xx-soc-corgi, pxa2xx-soc-spitz, imx-tsc2102, ]
+ [ pxa2xx-soc-poodle, pxa2xx-soc-tosa, s3c24xx-soc, ]
+ [ soc-pcm-sh7760, sh7760-ac97 ],
+ cards="$withval", cards="all")
+@@ -1962,6 +1964,19 @@ for card in $SELECTED_CARDS; do
probed=0
fi
fi
-+ if test "$card" = "all" -o "$card" = "imx-tsc"; then
++ if test "$card" = "all" -o "$card" = "imx-tsc2102"; then
+ if ( test "$CONFIG_SOUND" = "y" -o "$CONFIG_SOUND" = "m" ) &&
+ ( test "$CONFIG_ARM" = "y" -o "$CONFIG_ARM" = "m" ) &&
-+ ( test "$CONFIG_ARCH_SA1100" = "y" -o "$CONFIG_ARCH_SA1100" = "m" ); then
++ ( test "$CONFIG_ARCH_IMX" = "y" -o "$CONFIG_ARCH_IMX" = "m" ); then
+ CONFIG_SND_TIMER="m"
+ CONFIG_SND_PCM="m"
+ CONFIG_SND_IMX_TSC2102="m"
++ CONFIG_SND_IMX_SSI="m"
+ probed=1
+ elif test -z "$probed"; then
+ probed=0
@@ -28,20 +38,24 @@
if test "$card" = "all" -o "$card" = "armaaci"; then
if ( test "$CONFIG_SOUND" = "y" -o "$CONFIG_SOUND" = "m" ) &&
( test "$CONFIG_ARM" = "y" -o "$CONFIG_ARM" = "m" ) &&
-@@ -2928,6 +2941,9 @@
+@@ -2928,6 +2943,12 @@ fi
if test -n "$CONFIG_SND_SA11XX_UDA1341"; then
AC_DEFINE(CONFIG_SND_SA11XX_UDA1341_MODULE)
fi
++if test -n "$CONFIG_SND_IMX_SSI"; then
++ AC_DEFINE(CONFIG_SND_IMX_SSI_MODULE)
++fi
+if test -n "$CONFIG_SND_IMX_TSC2102"; then
+ AC_DEFINE(CONFIG_SND_IMX_TSC2102_MODULE)
+fi
if test -n "$CONFIG_SND_ARMAACI"; then
AC_DEFINE(CONFIG_SND_ARMAACI_MODULE)
fi
-@@ -3306,6 +3322,7 @@
+@@ -3306,6 +3327,8 @@ AC_SUBST(CONFIG_SND_AOA_SOUNDBUS)
AC_SUBST(CONFIG_SND_AOA_SOUNDBUS_I2S)
AC_SUBST(CONFIG_ARM)
AC_SUBST(CONFIG_SND_SA11XX_UDA1341)
++AC_SUBST(CONFIG_SND_IMX_SSI)
+AC_SUBST(CONFIG_SND_IMX_TSC2102)
AC_SUBST(CONFIG_ARCH_SA1100)
AC_SUBST(CONFIG_L3)
@@ -49,68 +63,41 @@
diff -urN -X linux-2.6.18.1/Documentation/dontdiff alsa-driver-1.0.14/alsa-kernel/arm/Kconfig alsa-driver-1.0.14.mod/alsa-kernel/arm/Kconfig
--- alsa-driver-1.0.14/alsa-kernel/arm/Kconfig 2007-06-04 09:28:52.000000000 +0200
+++ alsa-driver-1.0.14.mod/alsa-kernel/arm/Kconfig 2007-08-07 11:56:04.000000000 +0200
-@@ -33,4 +33,11 @@
+@@ -33,4 +33,20 @@
Say Y or M if you want to support any AC97 codec attached to
the PXA2xx AC97 interface.
++config SND_IMX_SSI
++ tristate "SSI support"
++ ---help---
++ Say Y to get the SSI services API available on IMX1 platform.
++
+config SND_IMX_TSC2102
-+ tristate "TSC2102 driver for the i.MXL"
-+ depends on ARCH_IMX && SND
++ tristate "IMX TSC2102 sound system"
++ depends on ARCH_IMX && IMX1_SSI
++ default N
++ select SND_PCM
++ select SND_IMX1_SSI
+ help
-+ Say Y or M if you want to support TSC2102 codec attached to
-+ the i.MXL SSI interface.
++ Say Y here to include support for TSC2102 chip with audio feature.
+
++ To compile this driver as a module, choose M here: the module
++ will be called snd-tsc2102.
endmenu
diff -urN -X linux-2.6.18.1/Documentation/dontdiff alsa-driver-1.0.14/alsa-kernel/arm/Makefile alsa-driver-1.0.14.mod/alsa-kernel/arm/Makefile
--- alsa-driver-1.0.14/alsa-kernel/arm/Makefile 2007-06-04 09:28:52.000000000 +0200
+++ alsa-driver-1.0.14.mod/alsa-kernel/arm/Makefile 2007-08-08 11:39:22.000000000 +0200
-@@ -12,4 +12,12 @@
+@@ -12,4 +12,10 @@
snd-pxa2xx-pcm-objs := pxa2xx-pcm.o
obj-$(CONFIG_SND_PXA2XX_AC97) += snd-pxa2xx-ac97.o
-+#obj-m += snd-pxa2xx-ac97.o
snd-pxa2xx-ac97-objs := pxa2xx-ac97.o
+
-+#obj-$(CONFIG_SND_IMX_TSC2102) += snd-imx-tsc.o
-+obj-m += snd-imx-tsc.o
-+snd-imx-tsc-objs := imx-tsc2102.o
++obj-$(CONFIG_SND_IMX_TSC2102) += snd-imx-tsc2102.o
++snd-imx-tsc2102-objs := imx-tsc2102.o
+
-+obj-m += snd-imx1-ssi.o
++obj-$(CONFIG_SND_IMX_SSI) += snd-imx1-ssi.o
+snd-imx1-ssi-objs := imx1-ssi.o
-diff -urN -X linux-2.6.18.1/Documentation/dontdiff alsa-driver-1.0.14/alsa-kernel/Kconfig alsa-driver-1.0.14.mod/alsa-kernel/Kconfig
---- alsa-driver-1.0.14/alsa-kernel/Kconfig 2007-06-04 09:28:52.000000000 +0200
-+++ alsa-driver-1.0.14.mod/alsa-kernel/Kconfig 2007-08-07 11:53:32.000000000 +0200
-@@ -32,7 +32,7 @@
- Kernel patches and supporting utilities to do that are in the pcsp
- package, available at <ftp://ftp.infradead.org/pub/pcsp/>.
-
--source "sound/oss/dmasound/Kconfig"
-+#source "sound/oss/dmasound/Kconfig"
-
- if !M68K
-
-@@ -91,7 +91,7 @@
- help
- Say 'Y' or 'M' to enable Open Sound System drivers.
-
--source "sound/oss/Kconfig"
-+#source "sound/oss/Kconfig"
-
- endmenu
-
-diff -urN -X linux-2.6.18.1/Documentation/dontdiff alsa-driver-1.0.14/alsa-kernel/Makefile alsa-driver-1.0.14.mod/alsa-kernel/Makefile
---- alsa-driver-1.0.14/alsa-kernel/Makefile 2007-06-04 09:28:52.000000000 +0200
-+++ alsa-driver-1.0.14.mod/alsa-kernel/Makefile 2007-08-07 12:03:05.000000000 +0200
-@@ -5,7 +5,8 @@
- obj-$(CONFIG_SOUND_PRIME) += sound_firmware.o
- obj-$(CONFIG_SOUND_PRIME) += oss/
- obj-$(CONFIG_DMASOUND) += oss/
--obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/ soc/
-+#obj-$(CONFIG_SND) += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/ soc/
-+obj-y += core/ i2c/ drivers/ isa/ pci/ ppc/ arm/ sh/ synth/ usb/ sparc/ parisc/ pcmcia/ mips/ soc/
- obj-$(CONFIG_SND_AOA) += aoa/
-
- # This one must be compilable even if sound is configured out
diff -urN -X linux-2.6.18.1/Documentation/dontdiff alsa-driver-1.0.14/arm/imx1-ssi.c alsa-driver-1.0.14.mod/arm/imx1-ssi.c
--- alsa-driver-1.0.14/arm/imx1-ssi.c 1970-01-01 01:00:00.000000000 +0100
+++ alsa-driver-1.0.14.mod/arm/imx1-ssi.c 2007-08-07 10:40:54.000000000 +0200
@@ -123,26 +110,9 @@
@@ -0,0 +1,2 @@
+#include "../alsa-kernel/arm/imx-tsc2102.c"
+EXPORT_NO_SYMBOLS;
-diff -urN -X linux-2.6.18.1/Documentation/dontdiff alsa-driver-1.0.14/configure alsa-driver-1.0.14.mod/configure
---- alsa-driver-1.0.14/configure 2007-06-04 09:29:01.000000000 +0200
-+++ alsa-driver-1.0.14.mod/configure 2007-08-06 20:11:32.000000000 +0200
-@@ -836,6 +836,7 @@
- CONFIG_SND_AOA_SOUNDBUS
- CONFIG_SND_AOA_SOUNDBUS_I2S
- CONFIG_SND_SA11XX_UDA1341
-+CONFIG_SND_IMX_TSC2102
- CONFIG_SND_ARMAACI
- CONFIG_ARM_AMBA
- CONFIG_SND_PXA2XX_PCM
-@@ -4356,6 +4357,7 @@
- CONFIG_SND_AOA_SOUNDBUS_I2S=""
- CONFIG_ARM=""
- CONFIG_SND_SA11XX_UDA1341=""
-+ CONFIG_SND_IMX_TSC2102=""
- CONFIG_ARCH_SA1100=""
- CONFIG_L3=""
- CONFIG_SND_ARMAACI=""
-@@ -7343,6 +7345,7 @@
+--- alsa-driver-1.0.14.ref/configure.in 2007-06-04 09:28:51.000000000 +0200
++++ alsa-driver-1.0.14/configure.in 2007-09-09 22:47:35.000000000 +0200
+@@ -825,6 +825,7 @@ CONFIG_L3=
CONFIG_ARM=
CONFIG_ARCH_SA1100=
CONFIG_ARCH_PXA=
@@ -150,18 +120,7 @@
CONFIG_PPC=
CONFIG_SPARC32=
CONFIG_SPARC64=
-@@ -7360,8 +7363,8 @@
- KERNDIR=$CONFIG_SND_KERNELDIR
- fi
- if test "$cross_compiling" = yes; then
-- { echo "$as_me:$LINENO: result: unknown" >&5
--echo "${ECHO_T}unknown" >&6; };processor=""
-+ { echo "$as_me:$LINENO: result: imx" >&5
-+echo "${ECHO_T}unknown" >&6; };processor="imx"
-
- else
- cat >conftest.$ac_ext <<_ACEOF
-@@ -7447,6 +7450,8 @@
+@@ -918,6 +919,8 @@ int main(void) {
fprintf(file, "sa1100");
#elif defined(CONFIG_ARCH_PXA)
fprintf(file, "pxa");
@@ -170,16 +129,8 @@
#elif defined(CONFIG_ARM_AMBA)
fprintf(file, "amba");
#elif defined(CONFIG_PARISC)
-@@ -7502,7 +7507,6 @@
-
-
- CFLAGS="$ac_save_CFLAGS"
--rm -f processor.id
- c_opts=""
- KLD=ld
- ARCH=
-@@ -7734,6 +7738,14 @@
- CONFIG_ARCH_PXA=y
+@@ -1166,6 +1168,14 @@ EOF
+ CONFIG_ARCH_SA1100=y
test "$CONFIG_ISA" = "probe" && CONFIG_ISA=
;;
+ imx)
@@ -190,93 +141,51 @@
+ CONFIG_ARCH_IMX=y
+ test "$CONFIG_ISA" = "probe" && CONFIG_ISA=
+ ;;
- amba)
+ pxa)
ARCH=arm
- c_opts="-O2 -mapcs-32 -march=armv4 -Wa,-mxscale -mshort-load-bytes -msoft-float"
-@@ -14464,6 +14476,18 @@
- probed=0
- fi
- fi
-+ if test "$card" = "all" -o "$card" = "imx-tsc"; then
-+ if ( test "$CONFIG_SOUND" = "y" -o "$CONFIG_SOUND" = "m" ) &&
-+ ( test "$CONFIG_ARM" = "y" -o "$CONFIG_ARM" = "m" ) &&
-+ ( test "$CONFIG_ARCH_IMX" = "y" -o "$CONFIG_ARCH_IMX" = "m" ); then
-+ CONFIG_SND_TIMER="m"
-+ CONFIG_SND_PCM="m"
-+ CONFIG_SND_IMX_TSC2102="m"
-+ probed=1
-+ elif test -z "$probed"; then
-+ probed=0
-+ fi
-+ fi
- if test "$card" = "all" -o "$card" = "armaaci"; then
- if ( test "$CONFIG_SOUND" = "y" -o "$CONFIG_SOUND" = "m" ) &&
- ( test "$CONFIG_ARM" = "y" -o "$CONFIG_ARM" = "m" ) &&
-@@ -15889,6 +15913,12 @@
- _ACEOF
-
- fi
-+if test -n "$CONFIG_SND_IMX_TSC2102"; then
-+ cat >>confdefs.h <<\_ACEOF
-+#define CONFIG_SND_IMX_TSC2102_MODULE 1
-+_ACEOF
-+
-+fi
- if test -n "$CONFIG_SND_ARMAACI"; then
- cat >>confdefs.h <<\_ACEOF
- #define CONFIG_SND_ARMAACI_MODULE 1
-diff -urN -X linux-2.6.18.1/Documentation/dontdiff alsa-driver-1.0.14/configure.in alsa-driver-1.0.14.mod/configure.in
---- alsa-driver-1.0.14/configure.in 2007-06-04 09:28:51.000000000 +0200
-+++ alsa-driver-1.0.14.mod/configure.in 2007-08-06 19:22:43.000000000 +0200
-@@ -918,6 +918,8 @@
- fprintf(file, "sa1100");
- #elif defined(CONFIG_ARCH_PXA)
- fprintf(file, "pxa");
-+#elif defined(CONFIG_ARCH_IMX)
-+ fprintf(file, "imx");
- #elif defined(CONFIG_ARM_AMBA)
- fprintf(file, "amba");
- #elif defined(CONFIG_PARISC)
-@@ -941,7 +943,6 @@
- AC_MSG_RESULT(unknown);processor=""
- )
- CFLAGS="$ac_save_CFLAGS"
--rm -f processor.id
- c_opts=""
- KLD=ld
- ARCH=
-diff -urN -X linux-2.6.18.1/Documentation/dontdiff alsa-driver-1.0.14/toplevel.config alsa-driver-1.0.14.mod/toplevel.config
---- alsa-driver-1.0.14/toplevel.config 2007-08-08 18:33:37.000000000 +0200
-+++ alsa-driver-1.0.14.mod/toplevel.config 2007-08-07 12:52:01.000000000 +0200
-@@ -182,8 +182,10 @@
- CONFIG_SND_AOA_TOONIE=
- CONFIG_SND_AOA_SOUNDBUS=
- CONFIG_SND_AOA_SOUNDBUS_I2S=
--CONFIG_ARM=
-+CONFIG_ARM=y
-+CONFIG_MACH_APF9328=y
- CONFIG_SND_SA11XX_UDA1341=
-+CONFIG_SND_IMX_TSC2102=m
- CONFIG_ARCH_SA1100=
- CONFIG_L3=
- CONFIG_SND_ARMAACI=
-@@ -191,6 +193,7 @@
- CONFIG_SND_PXA2XX_PCM=
- CONFIG_SND_PXA2XX_AC97=
- CONFIG_ARCH_PXA=
-+CONFIG_ARCH_IMX=y
- CONFIG_SND_S3C2410=
- CONFIG_ARCH_S3C2410=
- CONFIG_I2C_SENSOR=
+ c_opts="-O2 -mapcs-32 -march=armv4 -Wa,-mxscale -mtune=strongarm -mshort-load-bytes -msoft-float"
+@@ -1334,6 +1344,7 @@ AC_SUBST(CONFIG_ALPHA)
+ AC_SUBST(CONFIG_L3)
+ AC_SUBST(CONFIG_ARM)
+ AC_SUBST(CONFIG_ARCH_SA1100)
++AC_SUBST(CONFIG_ARCH_IMX)
+ AC_SUBST(CONFIG_ARCH_PXA)
+ AC_SUBST(CONFIG_PPC)
+ AC_SUBST(CONFIG_SPARC32)
diff -urN -X linux-2.6.18.1/Documentation/dontdiff alsa-driver-1.0.14/toplevel.config.in alsa-driver-1.0.14.mod/toplevel.config.in
--- alsa-driver-1.0.14/toplevel.config.in 2007-06-04 09:28:55.000000000 +0200
+++ alsa-driver-1.0.14.mod/toplevel.config.in 2007-08-06 20:02:26.000000000 +0200
-@@ -184,6 +184,7 @@
+@@ -184,6 +184,8 @@
CONFIG_SND_AOA_SOUNDBUS_I2S=@CONFIG_SND_AOA_SOUNDBUS_I2S@
CONFIG_ARM=@CONFIG_ARM@
CONFIG_SND_SA11XX_UDA1341=@CONFIG_SND_SA11XX_UDA1341@
++CONFIG_SND_IMX_SSI=@CONFIG_SND_IMX_SSI@
+CONFIG_SND_IMX_TSC2102=@CONFIG_SND_IMX_TSC2102@
CONFIG_ARCH_SA1100=@CONFIG_ARCH_SA1100@
CONFIG_L3=@CONFIG_L3@
CONFIG_SND_ARMAACI=@CONFIG_SND_ARMAACI@
-Binary files alsa-driver-1.0.14/utils/mod-deps and alsa-driver-1.0.14.mod/utils/mod-deps differ
+diff -purN alsa-driver-1.0.14.ref/include/config1.h.in alsa-driver-1.0.14/include/config1.h.in
+--- alsa-driver-1.0.14.ref/include/config1.h.in 2007-06-04 09:28:55.000000000 +0200
++++ alsa-driver-1.0.14/include/config1.h.in 2007-09-09 21:37:12.000000000 +0200
+@@ -188,6 +188,8 @@
+ #undef CONFIG_L3_MODULE
+ #undef CONFIG_SND_ARMAACI_MODULE
+ #undef CONFIG_ARM_AMBA_MODULE
++#undef CONFIG_SND_IMX_SSI_MODULE
++#undef CONFIG_SND_IMX_TSC2102_MODULE
+ #undef CONFIG_SND_PXA2XX_PCM_MODULE
+ #undef CONFIG_SND_PXA2XX_AC97_MODULE
+ #undef CONFIG_ARCH_PXA_MODULE
+diff -purN alsa-driver-1.0.14.ref/scripts/ksync.conf alsa-driver-1.0.14/scripts/ksync.conf
+--- alsa-driver-1.0.14.ref/scripts/ksync.conf 2007-06-04 09:28:54.000000000 +0200
++++ alsa-driver-1.0.14/scripts/ksync.conf 2007-09-09 21:01:42.000000000 +0200
+@@ -49,6 +49,8 @@ comment.map.alsa-driver::= \
+ /arm/devdma.[ch]:"ARM DMA routines" \
+ /arm/aaci.[ch]:"ARM AACI PL041 driver" \
+ /arm/sa11xx-uda1341.c:"SA11xx UDA1341 driver" \
++ /arm/imx1-ssi.*:"ARM imx ssi driver" \
++ /arm/imx-tsc2102.*:"ARM imx driver" \
+ /arm/pxa2xx.*:"ARM PXA2XX driver" \
+ /arm/s3c24xx-iis.[ch]:"ARM S3C24XX IIS driver" \
+ /arm:ERROR \
+
Deleted: trunk/buildroot/package/alsa-driver/alsa-driver-armadeus-rules.patch
===================================================================
--- trunk/buildroot/package/alsa-driver/alsa-driver-armadeus-rules.patch 2007-09-07 21:50:01 UTC (rev 639)
+++ trunk/buildroot/package/alsa-driver/alsa-driver-armadeus-rules.patch 2007-09-11 20:41:29 UTC (rev 640)
@@ -1,11 +0,0 @@
---- alsa-driver-1.0.14/Rules.make 2007-06-04 09:28:51.000000000 +0200
-+++ alsa-driver-1.0.14.working/Rules.make 2007-08-01 12:47:03.000000000 +0200
-@@ -158,7 +158,7 @@
-
- $(ld-multi-used-m) : %.o: $(ld-multi-objs-m)
- rm -f $@
-- $(LD) $(EXTRA_LDFLAGS) -r -o $@ $(filter $($(basename $@)-objs) $(extra-$(basename $@)-objs), $^)
-+ arm-linux-ld $(EXTRA_LDFLAGS) -r -o $@ $(filter $($(basename $@)-objs) $(extra-$(basename $@)-objs), $^)
-
- #
- # This make dependencies quickly
Modified: trunk/buildroot/package/alsa-driver/alsa-driver.mk
===================================================================
--- trunk/buildroot/package/alsa-driver/alsa-driver.mk 2007-09-07 21:50:01 UTC (rev 639)
+++ trunk/buildroot/package/alsa-driver/alsa-driver.mk 2007-09-11 20:41:29 UTC (rev 640)
@@ -20,52 +20,58 @@
toolchain/patch-kernel.sh $(ALSA_DRIVER_DIR) package/alsa-driver/ alsa-driver-armadeus\*.patch
# Copy our custom drivers (until they are integrated in alsa mainline)
cp -f package/alsa-driver/imx* $(ALSA_DRIVER_DIR)/alsa-kernel/arm/
-# $(CONFIG_UPDATE) $(ALSA_DRIVER_DIR)
touch $@
$(ALSA_DRIVER_DIR)/.configured: $(ALSA_DRIVER_DIR)/.unpacked
(cd $(ALSA_DRIVER_DIR); rm -rf config.cache; \
+ $(TARGET_CONFIGURE_OPTS) \
$(TARGET_CONFIGURE_ARGS) \
- $(TARGET_CONFIGURE_OPTS) \
CFLAGS="$(TARGET_CFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \
+ aclocal; \
+ autoconf; \
./configure \
+ --prefix=$(STAGING_DIR) \
--target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- --sysconfdir=/etc \
+ --with-kernel=$(LINUX_DIR) \
+ --with-moddir=$(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/extra \
--disable-docs \
--with-sequencer=yes \
--with-isapnp=no \
- --with-oss=yes \
- --with-kernel=${BUILD_DIR}/linux-2.6.18.1 \
- --with-kernel-version=2.6.18.1 \
- --with-cards=all \
- );
+ --with-oss=no \
+ --disable-old-api \
+ --with-redhat=no \
+ --with-suse=no \
+ --with-cross=arm-linux- \
+ --with-debug=full \
+ --with-kernel-version=$(LINUX_VERSION) \
+ --with-cards=all ;\
+ $(MAKE) dep \
+ );
touch $@
-$(ALSA_DRIVER_DIR)/modules/snd-imx-tsc.o: $(ALSA_DRIVER_DIR)/.configured
+$(ALSA_DRIVER_DIR)/modules/snd.ko: $(ALSA_DRIVER_DIR)/.configured
(export PATH=${PATH}:${STAGING_DIR}/bin ; \
- $(MAKE) -C $(ALSA_DRIVER_DIR) \
+ $(MAKE) -C $(ALSA_DRIVER_DIR); \
);
+ touch -c $@
-# $(STAGING_DIR)/$(ALSA_DRIVER_TARGET_BINARY): $(ALSA_DRIVER_DIR)/src/.libs/$(ALSA_DRIVER_BINARY)
-# $(MAKE) DESTDIR=$(STAGING_DIR) -C $(ALSA_DRIVER_DIR) install
-# $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libasound.la
-#
-# $(TARGET_DIR)/$(ALSA_DRIVER_TARGET_BINARY): $(STAGING_DIR)/$(ALSA_DRIVER_TARGET_BINARY)
-# mkdir -p $(TARGET_DIR)/usr/share/alsa
-# mkdir -p $(TARGET_DIR)/usr/lib/alsa-lib
-# cp -dpf $(STAGING_DIR)/lib/libasound.so* $(TARGET_DIR)/usr/lib/
-# cp -rdpf $(STAGING_DIR)/usr/share/alsa/* $(TARGET_DIR)/usr/share/alsa/
-# cp -rdpf $(STAGING_DIR)/usr/lib/alsa-lib/* $(TARGET_DIR)/usr/lib/alsa-lib/
-# -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libasound.so*
-# -$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/alsa-lib/*.so
-# touch -c $@
+$(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/extra/acore/snd.ko: $(ALSA_DRIVER_DIR)/modules/snd.ko
+ (export PATH=${PATH}:${STAGING_DIR}/bin ; \
+ $(MAKE) PATH=$(TARGET_PATH) -C $(ALSA_DRIVER_DIR) TARGET_DIR=$(TARGET_DIR) \
+ DEPMOD=`which true` install-modules; \
+ );
+ touch -c $@
-alsa-driver: uclibc linux $(ALSA_DRIVER_DIR)/modules/snd-imx-tsc.o
+$(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep: $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/extra/acore/snd.ko
+ package/alsa-driver/depmod.pl \
+ -b $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/ \
+ -k $(LINUX_DIR)/vmlinux \
+ -F $(LINUX_DIR)/System.map \
+ > $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
+alsa-driver: uclibc linux $(TARGET_DIR)/lib/modules/$(LINUX_VERSION)/modules.dep
+
alsa-driver-clean:
rm -f $(TARGET_DIR)/$(ALSA_DRIVER_TARGET_BINARY)
-$(MAKE) -C $(ALSA_DRIVER_DIR) clean
@@ -80,4 +86,4 @@
#############################################################
ifeq ($(strip $(BR2_PACKAGE_ALSA_DRIVER)),y)
TARGETS+=alsa-driver
-endif
\ No newline at end of file
+endif
Added: trunk/buildroot/package/alsa-driver/depmod.pl
===================================================================
--- trunk/buildroot/package/alsa-driver/depmod.pl (rev 0)
+++ trunk/buildroot/package/alsa-driver/depmod.pl 2007-09-11 20:41:29 UTC (rev 640)
@@ -0,0 +1,237 @@
+#!/usr/bin/perl -w
+# vi: set ts=4:
+# Copyright (c) 2001 David Schleef <ds...@sc...>
+# Copyright (c) 2001 Erik Andersen <and...@co...>
+# Copyright (c) 2001 Stuart Hughes <st...@li...>
+# Copyright (c) 2002 Steven J. Hill <sh...@br...>
+# This program is free software; you can redistribute it and/or modify it
+# under the same terms as Perl itself.
+
+# TODO -- use strict mode...
+#use strict;
+
+use Getopt::Long;
+use File::Find;
+
+
+# Set up some default values
+
+my $basedir="";
+my $kernel;
+my $kernelsyms;
+my $stdout=0;
+my $verbose=0;
+
+
+# get command-line options
+
+my %opt;
+
+GetOptions(
+ \%opt,
+ "help|h",
+ "basedir|b=s" => \$basedir,
+ "kernel|k=s" => \$kernel,
+ "kernelsyms|F=s" => \$kernelsyms,
+ "stdout|n" => \$stdout,
+ "verbose|v" => \$verbose,
+);
+
+if (defined $opt{help}) {
+ print
+ " $0 [OPTION]... [basedir]\n",
+ " -h --help\t\tShow this help screen\n",
+ " -b --basedir\tModules base directory (defaults to /lib/modules)\n",
+ " -k --kernel\tKernel binary for the target\n",
+ " -F --kernelsyms\tKernel symbol file\n",
+ " -n --stdout\tWrite to stdout instead of <basedir>/modules.dep\n",
+ " -v --verbose\tPrint out lots of debugging stuff\n",
+ ;
+ exit 1;
+}
+
+if($basedir !~ m-/lib/modules-) {
+ warn "WARNING: base directory does not match ..../lib/modules\n";
+}
+
+# Find the list of .o files living under $basedir
+#if ($verbose) { printf "Locating all modules\n"; }
+my($ofile) = "";
+my($file) = "";
+my(@liblist) = ();
+find sub {
+ if ( -f $_ && ! -d $_ ) {
+ $file = $File::Find::name;
+ if ( $file =~ /.o$/ ) {
+ push(@liblist, $file);
+ if ($verbose) { printf "$file\n"; }
+ }
+ }
+}, $basedir;
+if ($verbose) { printf "Finished locating modules\n"; }
+
+foreach $obj ( @liblist, $kernel ){
+ # turn the input file name into a target tag name
+ # vmlinux is a special that is only used to resolve symbols
+ if($obj =~ /vmlinux/) {
+ $tgtname = "vmlinux";
+ } else {
+ ($tgtname) = $obj =~ m-(/lib/modules/.*)$-;
+ }
+
+ warn "MODULE = $tgtname\n" if $verbose;
+
+ # get a list of symbols
+ @output=`nm $obj`;
+ $ksymtab=grep m/ __ksymtab/, @output;
+
+ # gather the exported symbols
+ if($ksymtab){
+ # explicitly exported
+ foreach ( @output ) {
+ / __ksymtab_(.*)$/ and do {
+ warn "sym = $1\n" if $verbose;
+ $exp->{$1} = $tgtname;
+ };
+ }
+ } else {
+ # exporting all symbols
+ foreach ( @output) {
+ / [ABCDGRST] (.*)$/ and do {
+ warn "syma = $1\n" if $verbose;
+ $exp->{$1} = $tgtname;
+ };
+ }
+ }
+ # gather the unresolved symbols
+ foreach ( @output ) {
+ !/ __this_module/ && / U (.*)$/ and do {
+ warn "und = $1\n" if $verbose;
+ push @{$dep->{$tgtname}}, $1;
+ };
+ }
+}
+
+
+# reduce dependancies: remove unresolvable and resolved from vmlinux
+# remove duplicates
+foreach $module (keys %$dep) {
+ $mod->{$module} = {};
+ foreach (@{$dep->{$module}}) {
+ if( $exp->{$_} ) {
+ warn "resolved symbol $_ in file $exp->{$_}\n" if $verbose;
+ next if $exp->{$_} =~ /vmlinux/;
+ $mod->{$module}{$exp->{$_}} = 1;
+ } else {
+ warn "unresolved symbol $_ in file $module\n";
+ }
+ }
+}
+
+# resolve the dependancies for each module
+if ($stdout == 1) {
+ foreach $module ( keys %$mod ) {
+ print "$module:\t";
+ @sorted = sort bydep keys %{$mod->{$module}};
+ print join(" \\\n\t",@sorted);
+ print "\n\n";
+ }
+} else {
+ open(OFILE, ">$basedir/modules.dep");
+ foreach $module ( keys %$mod ) {
+ print OFILE "$module:\t";
+ @sorted = sort bydep keys %{$mod->{$module}};
+ print OFILE join(" \\\n\t",@sorted);
+ print OFILE "\n\n";
+ }
+}
+
+
+sub bydep
+{
+ foreach my $f ( keys %{$mod->{$b}} ) {
+ if($f eq $a) {
+ return 1;
+ }
+ }
+ return -1;
+}
+
+
+
+__END__
+
+=head1 NAME
+
+depmod.pl - a cross platform script to generate kernel module dependency
+ lists which can then be used by modprobe.
+
+=head1 SYNOPSIS
+
+depmod.pl [OPTION]... [basedir]...
+
+Example:
+
+ depmod.pl -F linux/System.map target/lib/modules
+
+=head1 DESCRIPTION
+
+The purpose of this script is to automagically generate a list of of kernel
+module dependancies. This script produces dependancy lists that should be
+identical to the depmod program from the modutils package. Unlike the depmod
+binary, however, depmod.pl is designed to be run on your host system, not
+on your target system.
+
+This script was written by David Schleef <ds...@sc...> to be used in
+conjunction with the BusyBox modprobe applet.
+
+=head1 OPTIONS
+
+=over 4
+
+=item B<-h --help>
+
+This displays the help message.
+
+=item B<-b --basedir>
+
+The base directory uner which the target's modules will be found. This
+defaults to the /lib/modules directory.
+
+=item B<-k --kernel>
+
+Kernel binary for the target. You must either supply a kernel binary
+or a kernel symbol file (using the -F option).
+
+=item B<-F --kernelsyms>
+
+Kernel symbol file for the target. You must supply either a kernel symbol file
+kernel binary for the target (using the -k option).
+
+=item B<-n --stdout>
+
+Write to stdout instead of modules.dep. This is currently hard coded...
+kernel binary for the target (using the -k option).
+
+=item B<--verbose>
+
+Be verbose (not implemented)
+
+=back
+
+=head1 COPYRIGHT
+
+Copyright (c) 2001 David Schleef <ds...@sc...>
+Copyright (c) 2001 Erik Andersen <and...@co...>
+Copyright (c) 2001 Stuart Hughes <st...@li...>
+This program is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself.
+
+=head1 AUTHOR
+
+David Schleef <ds...@sc...>
+
+=cut
+
+# $Id: depmod.pl,v 1.1 2004/12/08 01:34:41 andersen Exp $
+
Property changes on: trunk/buildroot/package/alsa-driver/depmod.pl
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/buildroot/target/device/armadeus/apf9328/linux-2.6.18.1.config
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/linux-2.6.18.1.config 2007-09-07 21:50:01 UTC (rev 639)
+++ trunk/buildroot/target/device/armadeus/apf9328/linux-2.6.18.1.config 2007-09-11 20:41:29 UTC (rev 640)
@@ -737,9 +737,19 @@
#
# Sound
#
-# CONFIG_SOUND is not set
+CONFIG_SOUND=m
#
+# Advanced Linux Sound Architecture
+#
+# CONFIG_SND is not set
+
+#
+# Open Sound System
+#
+# CONFIG_SOUND_PRIME is not set
+
+#
# USB support
#
CONFIG_USB_ARCH_HAS_HCD=y
Modified: trunk/buildroot/target/device/armadeus/rootfs/device_table.txt
===================================================================
--- trunk/buildroot/target/device/armadeus/rootfs/device_table.txt 2007-09-07 21:50:01 UTC (rev 639)
+++ trunk/buildroot/target/device/armadeus/rootfs/device_table.txt 2007-09-11 20:41:29 UTC (rev 640)
@@ -34,6 +34,7 @@
#<name> <type> <mode> <uid> <gid> <major> <minor> <start> <inc> <count>
/dev d 755 0 0 - - - - -
/dev/pts d 755 0 0 - - - - -
+/dev/snd d 755 0 0 - - - - -
/tmp d 1777 0 0 - - - - -
/etc d 755 0 0 - - - - -
/home/default d 2755 1000 1000 - - - - -
@@ -90,6 +91,17 @@
#/dev/dsp1 c 666 0 29 14 19 - - -
#/dev/sndstat c 666 0 29 14 6 - - -
+/dev/audio c 666 0 29 14 4 - - -
+/dev/audio1 c 666 0 29 14 20 - - -
+/dev/dsp c 666 0 29 14 3 - - -
+/dev/dsp1 c 666 0 29 14 19 - - -
+/dev/sndstat c 666 0 29 14 6 - - -
+/dev/snd/controlC0 c 666 0 29 116 0 - - -
+/dev/snd/pcmC0D0p c 666 0 29 116 16 - - -
+/dev/snd/pcmC0D1p c 666 0 29 116 17 - - -
+/dev/snd/pcmC0D0c c 666 0 29 116 24 - - -
+/dev/snd/timer c 666 0 29 116 33 - - -
+
# User-mode Linux stuff
/dev/ubda b 640 0 0 98 0 0 0 -
/dev/ubda b 640 0 0 98 1 1 1 15
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
