summaryrefslogtreecommitdiffstats
path: root/drivers/sound/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/sound/Makefile')
-rw-r--r--drivers/sound/Makefile62
1 files changed, 46 insertions, 16 deletions
diff --git a/drivers/sound/Makefile b/drivers/sound/Makefile
index f072b7fad..c4fb47dce 100644
--- a/drivers/sound/Makefile
+++ b/drivers/sound/Makefile
@@ -41,19 +41,7 @@ obj- :=
# Each configuration option enables a list of files.
obj-$(CONFIG_SOUND) += soundcore.o
-
-ifeq ($(ARCH),m68k)
-
-obj-$(CONFIG_DMASOUND) += dmasound.o
-
-else
-
-ifeq ($(CONFIG_PMAC),y)
-
obj-$(CONFIG_DMASOUND) += dmasound.o
-
-else
-
obj-$(CONFIG_SOUND_OSS) += sound.o
obj-$(CONFIG_SOUND_ADLIB) += adlib_card.o opl3.o
obj-$(CONFIG_SOUND_CS4232) += cs4232.o ad1848.o
@@ -72,6 +60,7 @@ obj-$(CONFIG_SOUND_MSNDCLAS) += msnd.o msnd_classic.o
obj-$(CONFIG_SOUND_MSNDPIN) += msnd.o msnd_pinnacle.o
obj-$(CONFIG_SOUND_MSS) += ad1848.o
obj-$(CONFIG_SOUND_OPL3SA1) += opl3sa.o ad1848.o uart401.o
+obj-$(CONFIG_SOUND_OPL3SA2) += opl3sa2.o ad1848.o uart401.o mpu401.o
obj-$(CONFIG_SOUND_PAS) += pas2.o sb.o uart401.o
obj-$(CONFIG_SOUND_PSS) += pss.o ad1848.o mpu401.o
obj-$(CONFIG_SOUND_SB) += sb.o uart401.o
@@ -89,9 +78,6 @@ obj-$(CONFIG_SOUND_ES1370) += es1370.o
obj-$(CONFIG_SOUND_ES1371) += es1371.o
obj-$(CONFIG_SOUND_SONICVIBES) += sonicvibes.o
-endif
-endif
-
# Declare multi-part drivers.
list-multi := sound.o gus.o pas2.o sb.o softoss2.o vidc_mod.o \
@@ -219,7 +205,7 @@ maui.o: maui_boot.h
ifeq ($(CONFIG_MAUI_HAVE_BOOT),y)
maui_boot.h: $(patsubst "%", %, $(CONFIG_MAUI_BOOT_FILE)) bin2hex
- bin2hex -i maui_os < $(CONFIG_MAUI_BOOT_FILE) > $@
+ ./bin2hex -i maui_os < $(CONFIG_MAUI_BOOT_FILE) > $@
else
maui_boot.h:
( \
@@ -235,6 +221,50 @@ endif
+# Turtle Beach MultiSound
+
+ifeq ($(CONFIG_MSNDCLAS_HAVE_BOOT),y)
+ msnd_classic.o: msndperm.c msndinit.c
+
+ msndperm.c: $(patsubst "%", %, $(CONFIG_MSNDCLAS_PERM_FILE)) bin2hex
+ ./bin2hex msndperm < $(CONFIG_MSNDCLAS_PERM_FILE) > $@
+ @ ( \
+ echo 'ifeq ($(strip $(CONFIG_MSNDCLAS_HAVE_BOOT) $(CONFIG_MSNDCLAS_PERM_FILE)),$$(strip $$(CONFIG_MSNDCLAS_HAVE_BOOT) $$(CONFIG_MSNDCLAS_PERM_FILE)))'; \
+ echo 'FILES_BOOT_UP_TO_DATE += $@'; \
+ echo 'endif' \
+ ) > .$@.boot
+
+ msndinit.c: $(patsubst "%", %, $(CONFIG_MSNDCLAS_INIT_FILE)) bin2hex
+ ./bin2hex msndinit < $(CONFIG_MSNDCLAS_INIT_FILE) > $@
+ @ ( \
+ echo 'ifeq ($(strip $(CONFIG_MSNDCLAS_HAVE_BOOT) $(CONFIG_MSNDCLAS_INIT_FILE)),$$(strip $$(CONFIG_MSNDCLAS_HAVE_BOOT) $$(CONFIG_MSNDCLAS_INIT_FILE)))'; \
+ echo 'FILES_BOOT_UP_TO_DATE += $@'; \
+ echo 'endif' \
+ ) > .$@.boot
+endif
+
+ifeq ($(CONFIG_MSNDPIN_HAVE_BOOT),y)
+ msnd_pinnacle.o: pndsperm.c pndspini.c
+
+ pndsperm.c: $(patsubst "%", %, $(CONFIG_MSNDPIN_PERM_FILE)) bin2hex
+ ./bin2hex pndsperm < $(CONFIG_MSNDPIN_PERM_FILE) > $@
+ @ ( \
+ echo 'ifeq ($(strip $(CONFIG_MSNDPIN_HAVE_BOOT) $(CONFIG_MSNDPIN_PERM_FILE)),$$(strip $$(CONFIG_MSNDPIN_HAVE_BOOT) $$(CONFIG_MSNDPIN_PERM_FILE)))'; \
+ echo 'FILES_BOOT_UP_TO_DATE += $@'; \
+ echo 'endif' \
+ ) > .$@.boot
+
+ pndspini.c: $(patsubst "%", %, $(CONFIG_MSNDPIN_INIT_FILE)) bin2hex
+ ./bin2hex pndspini < $(CONFIG_MSNDPIN_INIT_FILE) > $@
+ @ ( \
+ echo 'ifeq ($(strip $(CONFIG_MSNDPIN_HAVE_BOOT) $(CONFIG_MSNDPIN_INIT_FILE)),$$(strip $$(CONFIG_MSNDPIN_HAVE_BOOT) $$(CONFIG_MSNDPIN_INIT_FILE)))'; \
+ echo 'FILES_BOOT_UP_TO_DATE += $@'; \
+ echo 'endif' \
+ ) > .$@.boot
+endif
+
+
+
# PSS (ECHO-ADI2111)
pss.o: pss_boot.h