From d284ff1e0cf9ab53f4e7bae890bc16575e9df292 Mon Sep 17 00:00:00 2001 From: Vatsal Bucha Date: Mon, 1 Apr 2019 15:34:50 +0530 Subject: [PATCH] Audio: Add lito target for audio-kernel Add lito target for audio-kernel modules. Change-Id: Ic8b43df74504950e4baad9701abeddcf8f30b420 Signed-off-by: Vatsal Bucha --- asoc/Android.mk | 7 ++++++- asoc/Kbuild | 12 ++++++++++++ asoc/codecs/Android.mk | 6 +++++- asoc/codecs/Kbuild | 5 +++++ asoc/codecs/bolero/Android.mk | 6 +++++- asoc/codecs/bolero/Kbuild | 5 +++++ asoc/codecs/wcd938x/Android.mk | 6 +++++- asoc/codecs/wcd938x/Kbuild | 5 +++++ dsp/Android.mk | 6 +++++- dsp/Kbuild | 5 +++++ dsp/codecs/Android.mk | 6 +++++- dsp/codecs/Kbuild | 5 +++++ ipc/Android.mk | 6 +++++- ipc/Kbuild | 5 +++++ soc/Android.mk | 10 +++++++--- soc/Kbuild | 5 +++++ 16 files changed, 90 insertions(+), 10 deletions(-) diff --git a/asoc/Android.mk b/asoc/Android.mk index db01167eba1e..ca2dffccc47c 100644 --- a/asoc/Android.mk +++ b/asoc/Android.mk @@ -23,9 +23,14 @@ TARGET := kona AUDIO_SELECT := CONFIG_SND_SOC_KONA=m endif +ifeq ($(call is-board-platform,lito),true) +TARGET := lito +AUDIO_SELECT := CONFIG_SND_SOC_LITO=m +endif + AUDIO_CHIPSET := audio # Build/Package only in case of supported target -ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona),true) +ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona lito),true) LOCAL_PATH := $(call my-dir) diff --git a/asoc/Kbuild b/asoc/Kbuild index 945d554c7014..2b0696b05e58 100644 --- a/asoc/Kbuild +++ b/asoc/Kbuild @@ -34,6 +34,11 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/konaautoconf.h endif + ifeq ($(CONFIG_ARCH_LITO), y) + include $(AUDIO_ROOT)/config/litoauto.conf + export + INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h + endif ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) include $(AUDIO_ROOT)/config/sm8150auto.conf export @@ -94,6 +99,10 @@ ifdef CONFIG_SND_SOC_KONA MACHINE_OBJS += kona.o endif +ifdef CONFIG_SND_SOC_LITO + MACHINE_OBJS += kona.o +endif + ifdef CONFIG_SND_SOC_CPE CPE_LSM_OBJS += msm-cpe-lsm.o endif @@ -192,6 +201,9 @@ machine_dlkm-y := $(MACHINE_OBJS) obj-$(CONFIG_SND_SOC_KONA) += machine_dlkm.o machine_dlkm-y := $(MACHINE_OBJS) +obj-$(CONFIG_SND_SOC_LITO) += machine_dlkm.o +machine_dlkm-y := $(MACHINE_OBJS) + obj-$(CONFIG_SND_SOC_CPE) += cpe_lsm_dlkm.o cpe_lsm_dlkm-y := $(CPE_LSM_OBJS) diff --git a/asoc/codecs/Android.mk b/asoc/codecs/Android.mk index b73b983ca01a..539bd55e91e7 100644 --- a/asoc/codecs/Android.mk +++ b/asoc/codecs/Android.mk @@ -19,9 +19,13 @@ ifeq ($(call is-board-platform,kona),true) AUDIO_SELECT := CONFIG_SND_SOC_KONA=m endif +ifeq ($(call is-board-platform,lito),true) +AUDIO_SELECT := CONFIG_SND_SOC_LITO=m +endif + AUDIO_CHIPSET := audio # Build/Package only in case of supported target -ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona),true) +ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona lito),true) LOCAL_PATH := $(call my-dir) diff --git a/asoc/codecs/Kbuild b/asoc/codecs/Kbuild index a40c75f47e0e..1d7142addba8 100644 --- a/asoc/codecs/Kbuild +++ b/asoc/codecs/Kbuild @@ -34,6 +34,11 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/konaautoconf.h endif + ifeq ($(CONFIG_ARCH_LITO), y) + include $(AUDIO_ROOT)/config/litoauto.conf + export + INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h + endif ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) include $(AUDIO_ROOT)/config/sm8150auto.conf export diff --git a/asoc/codecs/bolero/Android.mk b/asoc/codecs/bolero/Android.mk index d96d61645ef7..cf51a44f0bac 100644 --- a/asoc/codecs/bolero/Android.mk +++ b/asoc/codecs/bolero/Android.mk @@ -11,9 +11,13 @@ ifeq ($(call is-board-platform,kona),true) AUDIO_SELECT := CONFIG_SND_SOC_KONA=m endif +ifeq ($(call is-board-platform,lito),true) +AUDIO_SELECT := CONFIG_SND_SOC_LITO=m +endif + AUDIO_CHIPSET := audio # Build/Package only in case of supported target -ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET) kona),true) +ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET) kona lito),true) LOCAL_PATH := $(call my-dir) diff --git a/asoc/codecs/bolero/Kbuild b/asoc/codecs/bolero/Kbuild index 25d788170f4c..374b52894885 100644 --- a/asoc/codecs/bolero/Kbuild +++ b/asoc/codecs/bolero/Kbuild @@ -31,6 +31,11 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/konaautoconf.h endif + ifeq ($(CONFIG_ARCH_LITO), y) + include $(AUDIO_ROOT)/config/litoauto.conf + export + INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h + endif ifeq ($(CONFIG_ARCH_QCS405), y) include $(AUDIO_ROOT)/config/qcs405auto.conf export diff --git a/asoc/codecs/wcd938x/Android.mk b/asoc/codecs/wcd938x/Android.mk index 81bb35670715..96fb6f569701 100644 --- a/asoc/codecs/wcd938x/Android.mk +++ b/asoc/codecs/wcd938x/Android.mk @@ -7,9 +7,13 @@ ifeq ($(call is-board-platform,kona),true) AUDIO_SELECT := CONFIG_SND_SOC_KONA=m endif +ifeq ($(call is-board-platform,lito),true) +AUDIO_SELECT := CONFIG_SND_SOC_LITO=m +endif + AUDIO_CHIPSET := audio # Build/Package only in case of supported target -ifeq ($(call is-board-platform-in-list,kona),true) +ifeq ($(call is-board-platform-in-list,kona lito),true) LOCAL_PATH := $(call my-dir) diff --git a/asoc/codecs/wcd938x/Kbuild b/asoc/codecs/wcd938x/Kbuild index 309089074f24..e301bd5dfb01 100644 --- a/asoc/codecs/wcd938x/Kbuild +++ b/asoc/codecs/wcd938x/Kbuild @@ -19,6 +19,11 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/konaautoconf.h endif + ifeq ($(CONFIG_ARCH_LITO), y) + include $(AUDIO_ROOT)/config/litoauto.conf + export + INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h + endif endif diff --git a/dsp/Android.mk b/dsp/Android.mk index ddaebe2d6168..42fd4cb8ea7b 100644 --- a/dsp/Android.mk +++ b/dsp/Android.mk @@ -15,9 +15,13 @@ ifeq ($(call is-board-platform, kona),true) AUDIO_SELECT := CONFIG_SND_SOC_KONA=m endif +ifeq ($(call is-board-platform, lito),true) +AUDIO_SELECT := CONFIG_SND_SOC_LITO=m +endif + AUDIO_CHIPSET := audio # Build/Package only in case of supported target -ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona),true) +ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona lito),true) LOCAL_PATH := $(call my-dir) diff --git a/dsp/Kbuild b/dsp/Kbuild index daf0b303aa0e..cf9de150f494 100644 --- a/dsp/Kbuild +++ b/dsp/Kbuild @@ -29,6 +29,11 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/konaautoconf.h endif + ifeq ($(CONFIG_ARCH_LITO), y) + include $(AUDIO_ROOT)/config/litoauto.conf + export + INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h + endif ifeq ($(CONFIG_ARCH_SM8150), y) include $(AUDIO_ROOT)/config/sm8150auto.conf export diff --git a/dsp/codecs/Android.mk b/dsp/codecs/Android.mk index 25726ace8f31..65507176ceca 100644 --- a/dsp/codecs/Android.mk +++ b/dsp/codecs/Android.mk @@ -15,9 +15,13 @@ ifeq ($(call is-board-platform,kona),true) AUDIO_SELECT := CONFIG_SND_SOC_KONA=m endif +ifeq ($(call is-board-platform,lito),true) +AUDIO_SELECT := CONFIG_SND_SOC_LITO=m +endif + AUDIO_CHIPSET := audio # Build/Package only in case of supported target -ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona),true) +ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona lito),true) LOCAL_PATH := $(call my-dir) diff --git a/dsp/codecs/Kbuild b/dsp/codecs/Kbuild index c80cace5eec2..b4be4852ab40 100644 --- a/dsp/codecs/Kbuild +++ b/dsp/codecs/Kbuild @@ -29,6 +29,11 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/konaautoconf.h endif + ifeq ($(CONFIG_ARCH_LITO), y) + include $(AUDIO_ROOT)/config/litoauto.conf + export + INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h + endif ifeq ($(CONFIG_ARCH_SM8150), y) include $(AUDIO_ROOT)/config/sm8150auto.conf export diff --git a/ipc/Android.mk b/ipc/Android.mk index 066c5b801c91..800d8d4b8919 100644 --- a/ipc/Android.mk +++ b/ipc/Android.mk @@ -15,9 +15,13 @@ ifeq ($(call is-board-platform,kona),true) AUDIO_SELECT := CONFIG_SND_SOC_KONA=m endif +ifeq ($(call is-board-platform,lito),true) +AUDIO_SELECT := CONFIG_SND_SOC_LITO=m +endif + AUDIO_CHIPSET := audio # Build/Package only in case of supported target -ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona),true) +ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona lito),true) LOCAL_PATH := $(call my-dir) diff --git a/ipc/Kbuild b/ipc/Kbuild index 3577623d5a14..2da5fbd317f4 100644 --- a/ipc/Kbuild +++ b/ipc/Kbuild @@ -30,6 +30,11 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/konaautoconf.h endif + ifeq ($(CONFIG_ARCH_LITO), y) + include $(AUDIO_ROOT)/config/litoauto.conf + export + INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h + endif ifeq ($(CONFIG_ARCH_SM8150), y) include $(AUDIO_ROOT)/config/sm8150auto.conf export diff --git a/soc/Android.mk b/soc/Android.mk index 26f18e67affd..0698221db437 100644 --- a/soc/Android.mk +++ b/soc/Android.mk @@ -15,9 +15,13 @@ ifeq ($(call is-board-platform,kona),true) AUDIO_SELECT := CONFIG_SND_SOC_KONA=m endif +ifeq ($(call is-board-platform,lito),true) +AUDIO_SELECT := CONFIG_SND_SOC_LITO=m +endif + AUDIO_CHIPSET := audio # Build/Package only in case of supported target -ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona),true) +ifeq ($(call is-board-platform-in-list,msmnile $(MSMSTEPPE) $(TRINKET) kona lito),true) LOCAL_PATH := $(call my-dir) @@ -44,7 +48,7 @@ KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM) KBUILD_OPTIONS += $(AUDIO_SELECT) ########################################################### -ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET) kona),true) +ifeq ($(call is-board-platform-in-list,$(MSMSTEPPE) $(TRINKET) kona lito),true) include $(CLEAR_VARS) LOCAL_MODULE := $(AUDIO_CHIPSET)_pinctrl_lpi.ko LOCAL_MODULE_KBUILD_NAME := pinctrl_lpi_dlkm.ko @@ -78,7 +82,7 @@ LOCAL_MODULE_DEBUG_ENABLE := true LOCAL_MODULE_PATH := $(KERNEL_MODULES_OUT) include $(DLKM_DIR)/AndroidKernelModule.mk ########################################################### -ifeq ($(call is-board-platform-in-list, $(MSMSTEPPE) kona),true) +ifeq ($(call is-board-platform-in-list, $(MSMSTEPPE) kona lito),true) include $(CLEAR_VARS) LOCAL_MODULE := $(AUDIO_CHIPSET)_snd_event.ko LOCAL_MODULE_KBUILD_NAME := snd_event_dlkm.ko diff --git a/soc/Kbuild b/soc/Kbuild index 12d99c3dc059..20134c29901b 100644 --- a/soc/Kbuild +++ b/soc/Kbuild @@ -24,6 +24,11 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/konaautoconf.h endif + ifeq ($(CONFIG_ARCH_LITO), y) + include $(AUDIO_ROOT)/config/litoauto.conf + export + INCS += -include $(AUDIO_ROOT)/config/litoautoconf.h + endif ifeq ($(CONFIG_ARCH_SM6150), y) include $(AUDIO_ROOT)/config/sm6150auto.conf export