diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-04-16 10:12:01 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-04-16 10:12:01 -0700 |
| commit | 5f0b5040eb6af8055eb1344632fd7aa9358cd6a6 (patch) | |
| tree | 073aa259c33705511b02a9dfb4aa95047b825339 | |
| parent | dc591563b4f51508fc212b0187b9d77cf29e4c08 (diff) | |
| parent | e3842cf831b73f093b65e053a7f29f9de6617fb8 (diff) | |
| download | msm-extra-5f0b5040eb6af8055eb1344632fd7aa9358cd6a6.tar.gz | |
Merge "ASoC: Add audio support for sdmshrike"
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | asoc/Kbuild | 5 | ||||
| -rw-r--r-- | asoc/codecs/Kbuild | 5 | ||||
| -rw-r--r-- | asoc/codecs/aqt1000/Kbuild | 6 | ||||
| -rw-r--r-- | asoc/codecs/wcd934x/Kbuild | 5 | ||||
| -rw-r--r-- | asoc/codecs/wcd9360/Kbuild | 6 | ||||
| -rw-r--r-- | dsp/Kbuild | 5 | ||||
| -rw-r--r-- | dsp/codecs/Kbuild | 5 | ||||
| -rw-r--r-- | ipc/Kbuild | 9 | ||||
| -rw-r--r-- | soc/Kbuild | 5 |
10 files changed, 59 insertions, 0 deletions
@@ -15,6 +15,10 @@ ifeq ($(CONFIG_ARCH_SM8150), y) include $(srctree)/techpack/audio/config/sdm855auto.conf export endif +ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) +include $(srctree)/techpack/audio/config/sdm855auto.conf +export +endif # Use USERINCLUDE when you must reference the UAPI directories only. USERINCLUDE += \ @@ -42,6 +46,10 @@ ifeq ($(CONFIG_ARCH_SM8150), y) LINUXINCLUDE += \ -include $(srctree)/techpack/audio/config/sdm855autoconf.h endif +ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) +LINUXINCLUDE += \ + -include $(srctree)/techpack/audio/config/sdm855autoconf.h +endif obj-y += asoc/ obj-y += dsp/ diff --git a/asoc/Kbuild b/asoc/Kbuild index 53694440..453452c6 100644 --- a/asoc/Kbuild +++ b/asoc/Kbuild @@ -35,6 +35,11 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h endif + ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) + include $(AUDIO_ROOT)/config/sdm855auto.conf + export + INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h + endif endif # As per target team, build is done as follows: diff --git a/asoc/codecs/Kbuild b/asoc/codecs/Kbuild index c42cb7a2..412ec681 100644 --- a/asoc/codecs/Kbuild +++ b/asoc/codecs/Kbuild @@ -34,6 +34,11 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h endif + ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) + include $(AUDIO_ROOT)/config/sdm855auto.conf + export + INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h + endif endif # As per target team, build is done as follows: diff --git a/asoc/codecs/aqt1000/Kbuild b/asoc/codecs/aqt1000/Kbuild index 6ee5d3f8..94847144 100644 --- a/asoc/codecs/aqt1000/Kbuild +++ b/asoc/codecs/aqt1000/Kbuild @@ -28,6 +28,12 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h endif + + ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) + include $(AUDIO_ROOT)/config/sdm855auto.conf + export + INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h + endif endif # As per target team, build is done as follows: diff --git a/asoc/codecs/wcd934x/Kbuild b/asoc/codecs/wcd934x/Kbuild index 48c9ccdc..ee832063 100644 --- a/asoc/codecs/wcd934x/Kbuild +++ b/asoc/codecs/wcd934x/Kbuild @@ -36,6 +36,11 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h endif + ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) + include $(AUDIO_ROOT)/config/sdm855auto.conf + export + INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h + endif endif # As per target team, build is done as follows: diff --git a/asoc/codecs/wcd9360/Kbuild b/asoc/codecs/wcd9360/Kbuild index d4f54063..d9053a34 100644 --- a/asoc/codecs/wcd9360/Kbuild +++ b/asoc/codecs/wcd9360/Kbuild @@ -21,6 +21,12 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h endif + + ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) + include $(AUDIO_ROOT)/config/sdm855auto.conf + export + INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h + endif endif # As per target team, build is done as follows: @@ -34,6 +34,11 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h endif + ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) + include $(AUDIO_ROOT)/config/sdm855auto.conf + export + INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h + endif endif diff --git a/dsp/codecs/Kbuild b/dsp/codecs/Kbuild index 96875c65..09d77260 100644 --- a/dsp/codecs/Kbuild +++ b/dsp/codecs/Kbuild @@ -35,6 +35,11 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h endif + ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) + include $(AUDIO_ROOT)/config/sdm855auto.conf + export + INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h + endif endif # As per target team, build is done as follows: @@ -20,6 +20,10 @@ ifeq ($(CONFIG_ARCH_SM8150), y) TARGET_KERNEL_VERSION := 4.14 endif +ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) + TARGET_KERNEL_VERSION := 4.14 +endif + KDIR := $(TOP)/kernel/msm-$(TARGET_KERNEL_VERSION) ifeq ($(KERNEL_BUILD), 1) @@ -47,6 +51,11 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h endif + ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) + include $(AUDIO_ROOT)/config/sdm855auto.conf + export + INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h + endif endif # As per target team, build is done as follows: @@ -34,6 +34,11 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h endif + ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) + include $(AUDIO_ROOT)/config/sdm855auto.conf + export + INCS += -include $(AUDIO_ROOT)/config/sdm855autoconf.h + endif endif # As per target team, build is done as follows: |