Merge "dsp/ipc: update kbuild and header files for gvm bringup"
This commit is contained in:
commit
3c36eede88
8
Makefile
8
Makefile
@ -1,5 +1,9 @@
|
||||
# auto-detect subdirs
|
||||
ifneq ($(CONFIG_ARCH_QTI_VM), y)
|
||||
ifeq ($(CONFIG_QTI_QUIN_GVM), y)
|
||||
include $(srctree)/techpack/audio/config/gvmauto.conf
|
||||
export
|
||||
endif
|
||||
ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y)
|
||||
include $(srctree)/techpack/audio/config/sdxpoorwillsauto.conf
|
||||
export
|
||||
@ -34,6 +38,10 @@ LINUXINCLUDE += \
|
||||
-I$(srctree)/techpack/audio/include/uapi/audio \
|
||||
-I$(srctree)/techpack/audio/include
|
||||
|
||||
ifeq ($(CONFIG_QTI_QUIN_GVM), y)
|
||||
LINUXINCLUDE += \
|
||||
-include $(srctree)/techpack/audio/config/gvmautoconf.h
|
||||
endif
|
||||
ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y)
|
||||
LINUXINCLUDE += \
|
||||
-include $(srctree)/techpack/audio/config/sdxpoorwillsautoconf.h
|
||||
|
@ -71,7 +71,7 @@ ifeq ($(KERNEL_BUILD), 0)
|
||||
export
|
||||
INCS += -include $(AUDIO_ROOT)/config/qcs405autoconf.h
|
||||
endif
|
||||
ifeq ($(CONFIG_QTI_GVM), y)
|
||||
ifeq ($(CONFIG_QTI_QUIN_GVM), y)
|
||||
include $(AUDIO_ROOT)/config/gvmauto.conf
|
||||
export
|
||||
INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h
|
||||
|
@ -65,7 +65,7 @@ ifeq ($(KERNEL_BUILD), 0)
|
||||
export
|
||||
INCS += -include $(AUDIO_ROOT)/config/qcs405autoconf.h
|
||||
endif
|
||||
ifeq ($(CONFIG_QTI_GVM), y)
|
||||
ifeq ($(CONFIG_QTI_QUIN_GVM), y)
|
||||
include $(AUDIO_ROOT)/config/gvmauto.conf
|
||||
export
|
||||
INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h
|
||||
|
@ -13,3 +13,4 @@ CONFIG_SND_SOC_MSM_STUB=m
|
||||
CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m
|
||||
CONFIG_MSM_QDSP6V2_CODECS=m
|
||||
CONFIG_SND_EVENT=m
|
||||
CONFIG_SND_SOC_SA8155=m
|
||||
|
@ -25,3 +25,4 @@
|
||||
#define CONFIG_SND_SOC_MSM_HDMI_CODEC_RX 1
|
||||
#define CONFIG_MSM_QDSP6V2_CODECS 1
|
||||
#define CONFIG_SND_EVENT 1
|
||||
#define CONFIG_SND_SOC_SA8155 1
|
||||
|
@ -71,7 +71,7 @@ ifeq ($(KERNEL_BUILD), 0)
|
||||
export
|
||||
INCS += -include $(AUDIO_ROOT)/config/qcs405autoconf.h
|
||||
endif
|
||||
ifeq ($(CONFIG_QTI_GVM), y)
|
||||
ifeq ($(CONFIG_QTI_QUIN_GVM), y)
|
||||
include $(AUDIO_ROOT)/config/gvmauto.conf
|
||||
export
|
||||
INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h
|
||||
|
@ -53,7 +53,7 @@ ifeq ($(KERNEL_BUILD), 0)
|
||||
export
|
||||
INCS += -include $(AUDIO_ROOT)/config/qcs405autoconf.h
|
||||
endif
|
||||
ifeq ($(CONFIG_QTI_GVM), y)
|
||||
ifeq ($(CONFIG_QTI_QUIN_GVM), y)
|
||||
include $(AUDIO_ROOT)/config/gvmauto.conf
|
||||
export
|
||||
INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h
|
||||
|
@ -18,9 +18,8 @@
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/of_device.h>
|
||||
#include <linux/export.h>
|
||||
#include <linux/ion_kernel.h>
|
||||
#include <linux/ion.h>
|
||||
#include <ipc/apr.h>
|
||||
#include <asm/dma-iommu.h>
|
||||
#include <dsp/msm_audio_ion.h>
|
||||
#include <soc/qcom/secure_buffer.h>
|
||||
#include <linux/habmm.h>
|
||||
|
@ -72,7 +72,7 @@ ifeq ($(KERNEL_BUILD), 0)
|
||||
INCS += -include $(AUDIO_ROOT)/config/sm8150autoconf.h
|
||||
endif
|
||||
endif
|
||||
ifeq ($(CONFIG_QTI_GVM), y)
|
||||
ifeq ($(CONFIG_QTI_QUIN_GVM), y)
|
||||
include $(AUDIO_ROOT)/config/gvmauto.conf
|
||||
export
|
||||
INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h
|
||||
|
@ -23,7 +23,6 @@
|
||||
#include <linux/ipc_logging.h>
|
||||
#include <linux/of_platform.h>
|
||||
#include <soc/qcom/subsystem_restart.h>
|
||||
#include <soc/qcom/scm.h>
|
||||
#include <soc/snd_event.h>
|
||||
#include <dsp/apr_audio-v2.h>
|
||||
#include <dsp/audio_notifier.h>
|
||||
|
@ -71,7 +71,7 @@ ifeq ($(KERNEL_BUILD), 0)
|
||||
export
|
||||
INCS += -include $(AUDIO_ROOT)/config/qcs405autoconf.h
|
||||
endif
|
||||
ifeq ($(CONFIG_QTI_GVM), y)
|
||||
ifeq ($(CONFIG_QTI_QUIN_GVM), y)
|
||||
include $(AUDIO_ROOT)/config/gvmauto.conf
|
||||
export
|
||||
INCS += -include $(AUDIO_ROOT)/config/gvmautoconf.h
|
||||
|
Loading…
Reference in New Issue
Block a user