Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 0528c7494e67c30329d086df141d2dd691f01556

Authored by Michal Marek
Committed by Takashi Iwai
1 parent cd86a536c8
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

ALSA: clean up the logic for building sequencer modules 

Instead of mangling the CONFIG_* variables in the makefiles over and
over, set a few helper variables in Kconfig.

Signed-off-by: Michal Marek <mmarek@suse.cz>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 9 changed files with 31 additions and 69 deletions Side-by-side Diff

... ... @@ -205,4 +205,6 @@
205 205  
206 206 config SND_VMASTER
207 207 bool
  208 +
  209 +source "sound/core/seq/Kconfig"
sound/core/seq/Kconfig
Diff comments   View file @ 0528c74
  1 +# define SND_XXX_SEQ to min(SND_SEQUENCER,SND_XXX)
  2 +
  3 +config SND_RAWMIDI_SEQ
  4 + def_tristate SND_SEQUENCER && SND_RAWMIDI
  5 +
  6 +config SND_OPL3_LIB_SEQ
  7 + def_tristate SND_SEQUENCER && SND_OPL3_LIB
  8 +
  9 +config SND_OPL4_LIB_SEQ
  10 + def_tristate SND_SEQUENCER && SND_OPL4_LIB
  11 +
  12 +config SND_SBAWE_SEQ
  13 + def_tristate SND_SEQUENCER && SND_SBAWE
  14 +
  15 +config SND_EMU10K1_SEQ
  16 + def_tristate SND_SEQUENCER && SND_EMU10K1
sound/core/seq/Makefile
Diff comments   View file @ 0528c74
... ... @@ -17,14 +17,6 @@
17 17 snd-seq-dummy-objs := seq_dummy.o
18 18 snd-seq-virmidi-objs := seq_virmidi.o
19 19  
20   -#
21   -# this function returns:
22   -# "m" - CONFIG_SND_SEQUENCER is m
23   -# <empty string> - CONFIG_SND_SEQUENCER is undefined
24   -# otherwise parameter #1 value
25   -#
26   -sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1)))
27   -
28 20 obj-$(CONFIG_SND_SEQUENCER) += snd-seq.o snd-seq-device.o
29 21 ifeq ($(CONFIG_SND_SEQUENCER_OSS),y)
30 22 obj-$(CONFIG_SND_SEQUENCER) += snd-seq-midi-event.o
... ... @@ -33,9 +25,9 @@
33 25  
34 26 # Toplevel Module Dependency
35 27 obj-$(CONFIG_SND_VIRMIDI) += snd-seq-virmidi.o snd-seq-midi-event.o
36   -obj-$(call sequencer,$(CONFIG_SND_RAWMIDI)) += snd-seq-midi.o snd-seq-midi-event.o
37   -obj-$(call sequencer,$(CONFIG_SND_OPL3_LIB)) += snd-seq-midi-event.o snd-seq-midi-emul.o
38   -obj-$(call sequencer,$(CONFIG_SND_OPL4_LIB)) += snd-seq-midi-event.o snd-seq-midi-emul.o
39   -obj-$(call sequencer,$(CONFIG_SND_SBAWE)) += snd-seq-midi-emul.o snd-seq-virmidi.o
40   -obj-$(call sequencer,$(CONFIG_SND_EMU10K1)) += snd-seq-midi-emul.o snd-seq-virmidi.o
  28 +obj-$(CONFIG_SND_RAWMIDI_SEQ) += snd-seq-midi.o snd-seq-midi-event.o
  29 +obj-$(CONFIG_SND_OPL3_LIB_SEQ) += snd-seq-midi-event.o snd-seq-midi-emul.o
  30 +obj-$(CONFIG_SND_OPL4_LIB_SEQ) += snd-seq-midi-event.o snd-seq-midi-emul.o
  31 +obj-$(CONFIG_SND_SBAWE_SEQ) += snd-seq-midi-emul.o snd-seq-virmidi.o
  32 +obj-$(CONFIG_SND_EMU10K1_SEQ) += snd-seq-midi-emul.o snd-seq-virmidi.o
sound/drivers/opl3/Makefile
Diff comments   View file @ 0528c74
... ... @@ -7,15 +7,7 @@
7 7 snd-opl3-synth-y := opl3_seq.o opl3_midi.o opl3_drums.o
8 8 snd-opl3-synth-$(CONFIG_SND_SEQUENCER_OSS) += opl3_oss.o
9 9  
10   -#
11   -# this function returns:
12   -# "m" - CONFIG_SND_SEQUENCER is m
13   -# <empty string> - CONFIG_SND_SEQUENCER is undefined
14   -# otherwise parameter #1 value
15   -#
16   -sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1)))
17   -
18 10 obj-$(CONFIG_SND_OPL3_LIB) += snd-opl3-lib.o
19 11 obj-$(CONFIG_SND_OPL4_LIB) += snd-opl3-lib.o
20   -obj-$(call sequencer,$(CONFIG_SND_OPL3_LIB)) += snd-opl3-synth.o
  12 +obj-$(CONFIG_SND_OPL3_LIB_SEQ) += snd-opl3-synth.o
sound/drivers/opl4/Makefile
Diff comments   View file @ 0528c74
... ... @@ -6,14 +6,6 @@
6 6 snd-opl4-lib-objs := opl4_lib.o opl4_mixer.o opl4_proc.o
7 7 snd-opl4-synth-objs := opl4_seq.o opl4_synth.o yrw801.o
8 8  
9   -#
10   -# this function returns:
11   -# "m" - CONFIG_SND_SEQUENCER is m
12   -# <empty string> - CONFIG_SND_SEQUENCER is undefined
13   -# otherwise parameter #1 value
14   -#
15   -sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1)))
16   -
17 9 obj-$(CONFIG_SND_OPL4_LIB) += snd-opl4-lib.o
18   -obj-$(call sequencer,$(CONFIG_SND_OPL4_LIB)) += snd-opl4-synth.o
  10 +obj-$(CONFIG_SND_OPL4_LIB_SEQ) += snd-opl4-synth.o
sound/isa/sb/Makefile
Diff comments   View file @ 0528c74
... ... @@ -13,14 +13,6 @@
13 13 snd-emu8000-synth-objs := emu8000_synth.o emu8000_callback.o emu8000_patch.o emu8000_pcm.o
14 14 snd-es968-objs := es968.o
15 15  
16   -#
17   -# this function returns:
18   -# "m" - CONFIG_SND_SEQUENCER is m
19   -# <empty string> - CONFIG_SND_SEQUENCER is undefined
20   -# otherwise parameter #1 value
21   -#
22   -sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1)))
23   -
24 16 # Toplevel Module Dependency
25 17 obj-$(CONFIG_SND_SB_COMMON) += snd-sb-common.o
26 18 obj-$(CONFIG_SND_SB16_DSP) += snd-sb16-dsp.o
... ... @@ -33,5 +25,5 @@
33 25 obj-$(CONFIG_SND_SB16) += snd-sb16-csp.o
34 26 obj-$(CONFIG_SND_SBAWE) += snd-sb16-csp.o
35 27 endif
36   -obj-$(call sequencer,$(CONFIG_SND_SBAWE)) += snd-emu8000-synth.o
  28 +obj-$(CONFIG_SND_SBAWE_SEQ) += snd-emu8000-synth.o
sound/pci/emu10k1/Makefile
Diff comments   View file @ 0528c74
... ... @@ -9,16 +9,8 @@
9 9 snd-emu10k1-synth-objs := emu10k1_synth.o emu10k1_callback.o emu10k1_patch.o
10 10 snd-emu10k1x-objs := emu10k1x.o
11 11  
12   -#
13   -# this function returns:
14   -# "m" - CONFIG_SND_SEQUENCER is m
15   -# <empty string> - CONFIG_SND_SEQUENCER is undefined
16   -# otherwise parameter #1 value
17   -#
18   -sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1)))
19   -
20 12 # Toplevel Module Dependency
21 13 obj-$(CONFIG_SND_EMU10K1) += snd-emu10k1.o
22   -obj-$(call sequencer,$(CONFIG_SND_EMU10K1)) += snd-emu10k1-synth.o
  14 +obj-$(CONFIG_SND_EMU10K1_SEQ) += snd-emu10k1-synth.o
23 15 obj-$(CONFIG_SND_EMU10K1X) += snd-emu10k1x.o
sound/synth/Makefile
Diff comments   View file @ 0528c74
... ... @@ -5,17 +5,9 @@
5 5  
6 6 snd-util-mem-objs := util_mem.o
7 7  
8   -#
9   -# this function returns:
10   -# "m" - CONFIG_SND_SEQUENCER is m
11   -# <empty string> - CONFIG_SND_SEQUENCER is undefined
12   -# otherwise parameter #1 value
13   -#
14   -sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1)))
15   -
16 8 # Toplevel Module Dependency
17 9 obj-$(CONFIG_SND_EMU10K1) += snd-util-mem.o
18 10 obj-$(CONFIG_SND_TRIDENT) += snd-util-mem.o
19   -obj-$(call sequencer,$(CONFIG_SND_SBAWE)) += snd-util-mem.o
20   -obj-$(call sequencer,$(CONFIG_SND)) += emux/
  11 +obj-$(CONFIG_SND_SBAWE_SEQ) += snd-util-mem.o
  12 +obj-$(CONFIG_SND_SEQUENCER) += emux/
sound/synth/emux/Makefile
Diff comments   View file @ 0528c74
... ... @@ -7,15 +7,7 @@
7 7 emux_effect.o emux_proc.o emux_hwdep.o soundfont.o \
8 8 $(if $(CONFIG_SND_SEQUENCER_OSS),emux_oss.o)
9 9  
10   -#
11   -# this function returns:
12   -# "m" - CONFIG_SND_SEQUENCER is m
13   -# <empty string> - CONFIG_SND_SEQUENCER is undefined
14   -# otherwise parameter #1 value
15   -#
16   -sequencer = $(if $(subst y,,$(CONFIG_SND_SEQUENCER)),$(if $(1),m),$(if $(CONFIG_SND_SEQUENCER),$(1)))
17   -
18 10 # Toplevel Module Dependencies
19   -obj-$(call sequencer,$(CONFIG_SND_SBAWE)) += snd-emux-synth.o
20   -obj-$(call sequencer,$(CONFIG_SND_EMU10K1)) += snd-emux-synth.o
  11 +obj-$(CONFIG_SND_SBAWE_SEQ) += snd-emux-synth.o
  12 +obj-$(CONFIG_SND_EMU10K1_SEQ) += snd-emux-synth.o