From e46afa76639cb96becf1b7e1fbb1741ac3217d2f Mon Sep 17 00:00:00 2001 From: Raghu Ballappa Bankapur Date: Tue, 19 Mar 2024 15:40:04 +0530 Subject: [PATCH] audio-kernel: Fix compilation erros caused by export Fix the issues reported after adding export. Change-Id: I1462d56463545e88619cc70b5dbef052df872399 Signed-off-by: Raghu Ballappa Bankapur --- Makefile | 2 +- asoc/Kbuild | 11 ----------- asoc/codecs/Kbuild | 10 ---------- dsp/Kbuild | 12 ------------ ipc/Kbuild | 11 ----------- soc/Kbuild | 11 ----------- 6 files changed, 1 insertion(+), 56 deletions(-) diff --git a/Makefile b/Makefile index bfbed34c44..a26a0e1a2a 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ AUDIO_ROOT=$(KERNEL_SRC)/$(M) KBUILD_OPTIONS+= AUDIO_ROOT=$(AUDIO_ROOT) -all: clean modules +all: modules clean: $(MAKE) -C $(KERNEL_SRC) M=$(M) clean diff --git a/asoc/Kbuild b/asoc/Kbuild index 56f8d33256..d0200fd509 100644 --- a/asoc/Kbuild +++ b/asoc/Kbuild @@ -16,22 +16,18 @@ endif ifeq ($(CONFIG_SND_SOC_AUTO), y) ifdef CONFIG_SND_SOC_SA8155 include $(AUDIO_ROOT)/config/sa8155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa8155autoconf.h endif ifdef CONFIG_SND_SOC_SA6155 include $(AUDIO_ROOT)/config/sa6155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa6155autoconf.h endif ifdef CONFIG_SND_SOC_GVM include $(AUDIO_ROOT)/config/gvmauto.conf - export INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h endif ifdef CONFIG_SND_SOC_SA7255 include $(AUDIO_ROOT)/config/sa7255auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa7255autoconf.h endif @@ -40,22 +36,18 @@ ifeq ($(KERNEL_BUILD), 0) ifeq ($(CONFIG_ARCH_SM8150), y) ifdef CONFIG_SND_SOC_SA8155 include $(AUDIO_ROOT)/config/sa8155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa8155autoconf.h else include $(AUDIO_ROOT)/config/sm8150auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h endif endif ifeq ($(CONFIG_ARCH_SM6150), y) ifdef CONFIG_SND_SOC_SA6155 include $(AUDIO_ROOT)/config/sa6155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa6155autoconf.h else include $(AUDIO_ROOT)/config/sm6150auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h endif endif @@ -105,11 +97,9 @@ ifeq ($(KERNEL_BUILD), 0) ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) ifdef CONFIG_SND_SOC_SA8155 include $(AUDIO_ROOT)/config/sa8155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa8155autoconf.h else include $(AUDIO_ROOT)/config/sm8150auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h endif endif @@ -120,7 +110,6 @@ ifeq ($(KERNEL_BUILD), 0) endif ifeq ($(CONFIG_QTI_QUIN_GVM), y) include $(AUDIO_ROOT)/config/gvmauto.conf - export INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h endif ifeq ($(CONFIG_ARCH_SDXLEMUR), y) diff --git a/asoc/codecs/Kbuild b/asoc/codecs/Kbuild index ce25c76703..2c6cc2ba41 100644 --- a/asoc/codecs/Kbuild +++ b/asoc/codecs/Kbuild @@ -16,22 +16,18 @@ endif ifeq ($(CONFIG_SND_SOC_AUTO), y) ifdef CONFIG_SND_SOC_SA8155 include $(AUDIO_ROOT)/config/sa8155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa8155autoconf.h endif ifdef CONFIG_SND_SOC_SA6155 include $(AUDIO_ROOT)/config/sa6155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa6155autoconf.h endif ifdef CONFIG_SND_SOC_GVM include $(AUDIO_ROOT)/config/gvmauto.conf - export INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h endif ifdef CONFIG_SND_SOC_SA7255 include $(AUDIO_ROOT)/config/sa7255auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa7255autoconf.h endif else @@ -39,22 +35,18 @@ ifeq ($(KERNEL_BUILD), 0) ifeq ($(CONFIG_ARCH_SM8150), y) ifdef CONFIG_SND_SOC_SA8155 include $(AUDIO_ROOT)/config/sa8155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa8155autoconf.h else include $(AUDIO_ROOT)/config/sm8150auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h endif endif ifeq ($(CONFIG_ARCH_SM6150), y) ifdef CONFIG_SND_SOC_SA6155 include $(AUDIO_ROOT)/config/sa6155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa6155autoconf.h else include $(AUDIO_ROOT)/config/sm6150auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h endif endif @@ -103,7 +95,6 @@ ifeq ($(KERNEL_BUILD), 0) endif ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) include $(AUDIO_ROOT)/config/sm8150auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h endif ifeq ($(CONFIG_ARCH_QCS405), y) @@ -113,7 +104,6 @@ ifeq ($(KERNEL_BUILD), 0) endif ifeq ($(CONFIG_QTI_QUIN_GVM), y) include $(AUDIO_ROOT)/config/gvmauto.conf - export INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h endif ifeq ($(CONFIG_ARCH_SDXLEMUR), y) diff --git a/dsp/Kbuild b/dsp/Kbuild index 238d3c902c..13e771fd4c 100644 --- a/dsp/Kbuild +++ b/dsp/Kbuild @@ -16,22 +16,18 @@ endif ifeq ($(CONFIG_SND_SOC_AUTO), y) ifdef CONFIG_SND_SOC_SA8155 include $(AUDIO_ROOT)/config/sa8155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa8155autoconf.h endif ifdef CONFIG_SND_SOC_SA6155 include $(AUDIO_ROOT)/config/sa6155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa6155autoconf.h endif ifdef CONFIG_SND_SOC_GVM include $(AUDIO_ROOT)/config/gvmauto.conf - export INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h endif ifdef CONFIG_SND_SOC_SA7255 include $(AUDIO_ROOT)/config/sa7255auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa7255autoconf.h endif else @@ -39,17 +35,14 @@ ifeq ($(KERNEL_BUILD), 0) ifeq ($(CONFIG_ARCH_SM6150), y) ifdef CONFIG_SND_SOC_SA6155 include $(AUDIO_ROOT)/config/sa6155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa6155autoconf.h else include $(AUDIO_ROOT)/config/sm6150auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h endif endif ifeq ($(CONFIG_ARCH_TRINKET), y) include $(AUDIO_ROOT)/config/sm6150auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h endif ifeq ($(CONFIG_ARCH_KONA), y) @@ -93,22 +86,18 @@ ifeq ($(KERNEL_BUILD), 0) ifeq ($(CONFIG_ARCH_SM8150), y) ifdef CONFIG_SND_SOC_SA8155 include $(AUDIO_ROOT)/config/sa8155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa8155autoconf.h else include $(AUDIO_ROOT)/config/sm8150auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h endif endif ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) ifdef CONFIG_SND_SOC_SA8155 include $(AUDIO_ROOT)/config/sa8155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa8155autoconf.h else include $(AUDIO_ROOT)/config/sm8150auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h endif endif @@ -119,7 +108,6 @@ ifeq ($(KERNEL_BUILD), 0) endif ifeq ($(CONFIG_QTI_QUIN_GVM), y) include $(AUDIO_ROOT)/config/gvmauto.conf - export INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h endif ifeq ($(CONFIG_ARCH_SDXLEMUR), y) diff --git a/ipc/Kbuild b/ipc/Kbuild index 59db090bf6..3052b7b011 100644 --- a/ipc/Kbuild +++ b/ipc/Kbuild @@ -17,22 +17,18 @@ endif ifeq ($(CONFIG_SND_SOC_AUTO), y) ifdef CONFIG_SND_SOC_SA8155 include $(AUDIO_ROOT)/config/sa8155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa8155autoconf.h endif ifdef CONFIG_SND_SOC_SA6155 include $(AUDIO_ROOT)/config/sa6155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa6155autoconf.h endif ifdef CONFIG_SND_SOC_GVM include $(AUDIO_ROOT)/config/gvmauto.conf - export INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h endif ifdef CONFIG_SND_SOC_SA7255 include $(AUDIO_ROOT)/config/sa7255auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa7255autoconf.h endif else @@ -40,11 +36,9 @@ ifeq ($(KERNEL_BUILD), 0) ifeq ($(CONFIG_ARCH_SM6150), y) ifdef CONFIG_SND_SOC_SA6155 include $(AUDIO_ROOT)/config/sa6155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa6155autoconf.h else include $(AUDIO_ROOT)/config/sm6150auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h endif endif @@ -94,11 +88,9 @@ ifeq ($(KERNEL_BUILD), 0) ifeq ($(CONFIG_ARCH_SM8150), y) ifdef CONFIG_SND_SOC_SA8155 include $(AUDIO_ROOT)/config/sa8155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa8155autoconf.h else include $(AUDIO_ROOT)/config/sm8150auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h endif endif @@ -110,17 +102,14 @@ ifeq ($(KERNEL_BUILD), 0) ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) ifdef CONFIG_SND_SOC_SA8155 include $(AUDIO_ROOT)/config/sa8155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa8155autoconf.h else include $(AUDIO_ROOT)/config/sm8150auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h endif endif ifeq ($(CONFIG_QTI_QUIN_GVM), y) include $(AUDIO_ROOT)/config/gvmauto.conf - export INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h endif ifeq ($(CONFIG_ARCH_SDXLEMUR), y) diff --git a/soc/Kbuild b/soc/Kbuild index e87cb83e33..8b2f28ac95 100644 --- a/soc/Kbuild +++ b/soc/Kbuild @@ -16,22 +16,18 @@ endif ifeq ($(CONFIG_SND_SOC_AUTO), y) ifdef CONFIG_SND_SOC_SA8155 include $(AUDIO_ROOT)/config/sa8155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa8155autoconf.h endif ifdef CONFIG_SND_SOC_SA6155 include $(AUDIO_ROOT)/config/sa6155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa6155autoconf.h endif ifdef CONFIG_SND_SOC_GVM include $(AUDIO_ROOT)/config/gvmauto.conf - export INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h endif ifdef CONFIG_SND_SOC_SA7255 include $(AUDIO_ROOT)/config/sa7255auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa7255autoconf.h endif else @@ -39,11 +35,9 @@ ifeq ($(KERNEL_BUILD), 0) ifeq ($(CONFIG_ARCH_SM8150), y) ifdef CONFIG_SND_SOC_SA8155 include $(AUDIO_ROOT)/config/sa8155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa8155autoconf.h else include $(AUDIO_ROOT)/config/sm8150auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h endif endif @@ -92,11 +86,9 @@ ifeq ($(KERNEL_BUILD), 0) ifeq ($(CONFIG_ARCH_SM6150), y) ifdef CONFIG_SND_SOC_SA6155 include $(AUDIO_ROOT)/config/sa6155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa6155autoconf.h else include $(AUDIO_ROOT)/config/sm6150auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sm6150autoconf.h endif endif @@ -108,11 +100,9 @@ ifeq ($(KERNEL_BUILD), 0) ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) ifdef CONFIG_SND_SOC_SA8155 include $(AUDIO_ROOT)/config/sa8155auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sa8155autoconf.h else include $(AUDIO_ROOT)/config/sm8150auto.conf - export INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h endif endif @@ -123,7 +113,6 @@ ifeq ($(KERNEL_BUILD), 0) endif ifeq ($(CONFIG_QTI_QUIN_GVM), y) include $(AUDIO_ROOT)/config/gvmauto.conf - export INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h endif ifeq ($(CONFIG_ARCH_SDXLEMUR), y)