From ad978894b998ee3efbfdca302b2e0a7509b85688 Mon Sep 17 00:00:00 2001 From: Salendarsingh Gaud Date: Mon, 14 May 2018 16:53:09 +0530 Subject: [PATCH] Configure CONFIG_ARCH to enable compilation Use CONFIG_ARCH_SM6150 for Talos to enable proper compilation. Change-Id: I14e06122116c431bf4b99da3a061d165f68e0d4f Signed-off-by: Tanya Dixit --- asoc/Kbuild | 2 +- asoc/codecs/Kbuild | 2 +- asoc/codecs/aqt1000/Kbuild | 2 +- asoc/codecs/wcd934x/Kbuild | 2 +- asoc/codecs/wcd9360/Kbuild | 2 +- dsp/Kbuild | 2 +- dsp/codecs/Kbuild | 2 +- ipc/Kbuild | 8 ++++++++ soc/Kbuild | 2 +- 9 files changed, 16 insertions(+), 8 deletions(-) diff --git a/asoc/Kbuild b/asoc/Kbuild index 893d95b067..8c37917702 100644 --- a/asoc/Kbuild +++ b/asoc/Kbuild @@ -35,7 +35,7 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h endif - ifeq ($(CONFIG_ARCH_SDM640), y) + ifeq ($(CONFIG_ARCH_SM6150), y) include $(AUDIO_ROOT)/config/sm8150auto.conf export INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h diff --git a/asoc/codecs/Kbuild b/asoc/codecs/Kbuild index d3789b553f..10b8096599 100644 --- a/asoc/codecs/Kbuild +++ b/asoc/codecs/Kbuild @@ -34,7 +34,7 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h endif - ifeq ($(CONFIG_ARCH_SDM640), y) + ifeq ($(CONFIG_ARCH_SM6150), y) include $(AUDIO_ROOT)/config/sm8150auto.conf export INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h diff --git a/asoc/codecs/aqt1000/Kbuild b/asoc/codecs/aqt1000/Kbuild index d870c1df12..2b002df881 100644 --- a/asoc/codecs/aqt1000/Kbuild +++ b/asoc/codecs/aqt1000/Kbuild @@ -28,7 +28,7 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h endif - ifeq ($(CONFIG_ARCH_SDM640), y) + ifeq ($(CONFIG_ARCH_SM6150), y) include $(AUDIO_ROOT)/config/sm8150auto.conf export INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h diff --git a/asoc/codecs/wcd934x/Kbuild b/asoc/codecs/wcd934x/Kbuild index 40326113c5..1287dd73a3 100644 --- a/asoc/codecs/wcd934x/Kbuild +++ b/asoc/codecs/wcd934x/Kbuild @@ -31,7 +31,7 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h endif - ifeq ($(CONFIG_ARCH_SDM640), y) + ifeq ($(CONFIG_ARCH_SM6150), y) include $(AUDIO_ROOT)/config/sm8150auto.conf export INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h diff --git a/asoc/codecs/wcd9360/Kbuild b/asoc/codecs/wcd9360/Kbuild index e815e24675..5b87cde498 100644 --- a/asoc/codecs/wcd9360/Kbuild +++ b/asoc/codecs/wcd9360/Kbuild @@ -21,7 +21,7 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h endif - ifeq ($(CONFIG_ARCH_SDM640), y) + ifeq ($(CONFIG_ARCH_SM6150), y) include $(AUDIO_ROOT)/config/sm8150auto.conf export INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h diff --git a/dsp/Kbuild b/dsp/Kbuild index e75dbd1986..f22573273f 100644 --- a/dsp/Kbuild +++ b/dsp/Kbuild @@ -29,7 +29,7 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h endif - ifeq ($(CONFIG_ARCH_SDM640), y) + ifeq ($(CONFIG_ARCH_SM6150), y) include $(AUDIO_ROOT)/config/sm8150auto.conf export INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h diff --git a/dsp/codecs/Kbuild b/dsp/codecs/Kbuild index 67ac30c02e..bdcc9dc413 100644 --- a/dsp/codecs/Kbuild +++ b/dsp/codecs/Kbuild @@ -30,7 +30,7 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h endif - ifeq ($(CONFIG_ARCH_SDM640), y) + ifeq ($(CONFIG_ARCH_SM6150), y) include $(AUDIO_ROOT)/config/sm8150auto.conf export INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h diff --git a/ipc/Kbuild b/ipc/Kbuild index afcb967fd9..a860a751f1 100644 --- a/ipc/Kbuild +++ b/ipc/Kbuild @@ -19,6 +19,9 @@ endif ifeq ($(CONFIG_ARCH_SM8150), y) TARGET_KERNEL_VERSION := 4.14 endif +ifeq ($(CONFIG_ARCH_SM6150), y) + TARGET_KERNEL_VERSION := 4.14 +endif ifeq ($(CONFIG_ARCH_SDMSHRIKE), y) TARGET_KERNEL_VERSION := 4.14 @@ -46,6 +49,11 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/sdm670autoconf.h endif + ifeq ($(CONFIG_ARCH_SM6150), y) + include $(AUDIO_ROOT)/config/sm8150auto.conf + export + INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h + endif ifeq ($(CONFIG_ARCH_SM8150), y) include $(AUDIO_ROOT)/config/sm8150auto.conf export diff --git a/soc/Kbuild b/soc/Kbuild index 5ea10931af..3aaa38814d 100644 --- a/soc/Kbuild +++ b/soc/Kbuild @@ -34,7 +34,7 @@ ifeq ($(KERNEL_BUILD), 0) export INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h endif - ifeq ($(CONFIG_ARCH_SDM640), y) + ifeq ($(CONFIG_ARCH_SM6150), y) include $(AUDIO_ROOT)/config/sm8150auto.conf export INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h