From 4025a25a2479fc343f6aa413b01a656665656386 Mon Sep 17 00:00:00 2001 From: David Ng Date: Fri, 26 Apr 2019 23:08:34 -0700 Subject: [PATCH] makefile: kona: remove make export instances Replace all kernel make export instances with export of specific variables. Depending on existing build environment, exporting all as environment variables and interaction with existing environment variable expansions can lead to undefined behavior. TODO: This change is restricted to kona flow to narrow impact. All remaining export need to be evaluated and fixed similarly via subsequent changes. Change-Id: I9114b88f7511d1b3f9b496b76fb6da9db97772b8 Signed-off-by: David Ng --- asoc/Kbuild | 1 - asoc/codecs/Kbuild | 1 - asoc/codecs/bolero/Kbuild | 1 - asoc/codecs/wcd938x/Kbuild | 1 - config/konaauto.conf | 76 +++++++++++++++++++------------------- dsp/Kbuild | 1 - dsp/codecs/Kbuild | 1 - ipc/Kbuild | 1 - soc/Kbuild | 1 - 9 files changed, 38 insertions(+), 46 deletions(-) diff --git a/asoc/Kbuild b/asoc/Kbuild index 2b0696b05e..5ff12c61c1 100644 --- a/asoc/Kbuild +++ b/asoc/Kbuild @@ -31,7 +31,6 @@ ifeq ($(KERNEL_BUILD), 0) endif ifeq ($(CONFIG_ARCH_KONA), y) include $(AUDIO_ROOT)/config/konaauto.conf - export INCS += -include $(AUDIO_ROOT)/config/konaautoconf.h endif ifeq ($(CONFIG_ARCH_LITO), y) diff --git a/asoc/codecs/Kbuild b/asoc/codecs/Kbuild index 1d7142addb..df8657845f 100644 --- a/asoc/codecs/Kbuild +++ b/asoc/codecs/Kbuild @@ -31,7 +31,6 @@ ifeq ($(KERNEL_BUILD), 0) endif ifeq ($(CONFIG_ARCH_KONA), y) include $(AUDIO_ROOT)/config/konaauto.conf - export INCS += -include $(AUDIO_ROOT)/config/konaautoconf.h endif ifeq ($(CONFIG_ARCH_LITO), y) diff --git a/asoc/codecs/bolero/Kbuild b/asoc/codecs/bolero/Kbuild index 374b528948..06883a3fbc 100644 --- a/asoc/codecs/bolero/Kbuild +++ b/asoc/codecs/bolero/Kbuild @@ -28,7 +28,6 @@ ifeq ($(KERNEL_BUILD), 0) endif ifeq ($(CONFIG_ARCH_KONA), y) include $(AUDIO_ROOT)/config/konaauto.conf - export INCS += -include $(AUDIO_ROOT)/config/konaautoconf.h endif ifeq ($(CONFIG_ARCH_LITO), y) diff --git a/asoc/codecs/wcd938x/Kbuild b/asoc/codecs/wcd938x/Kbuild index e301bd5dfb..3dfe142bcf 100644 --- a/asoc/codecs/wcd938x/Kbuild +++ b/asoc/codecs/wcd938x/Kbuild @@ -16,7 +16,6 @@ endif ifeq ($(KERNEL_BUILD), 0) ifeq ($(CONFIG_ARCH_KONA), y) include $(AUDIO_ROOT)/config/konaauto.conf - export INCS += -include $(AUDIO_ROOT)/config/konaautoconf.h endif ifeq ($(CONFIG_ARCH_LITO), y) diff --git a/config/konaauto.conf b/config/konaauto.conf index 7b03dea339..03e0541503 100644 --- a/config/konaauto.conf +++ b/config/konaauto.conf @@ -1,38 +1,38 @@ -CONFIG_PINCTRL_LPI=m -CONFIG_PINCTRL_WCD=m -CONFIG_AUDIO_EXT_CLK=m -CONFIG_SND_SOC_WCD9XXX_V2=m -CONFIG_SND_SOC_WCD_MBHC=m -CONFIG_SND_SOC_WSA881X=m -CONFIG_WCD9XXX_CODEC_CORE_V2=m -CONFIG_MSM_CDC_PINCTRL=m -CONFIG_MSM_QDSP6V2_CODECS=m -CONFIG_MSM_ULTRASOUND=m -CONFIG_MSM_QDSP6_APRV2_RPMSG=m -CONFIG_MSM_ADSP_LOADER=m -CONFIG_REGMAP_SWR=m -CONFIG_MSM_QDSP6_SSR=m -CONFIG_MSM_QDSP6_PDR=m -CONFIG_MSM_QDSP6_NOTIFIER=m -CONFIG_SND_SOC_MSM_HOSTLESS_PCM=m -CONFIG_SND_SOC_MSM_QDSP6V2_INTF=m -CONFIG_SOUNDWIRE=m -CONFIG_SOUNDWIRE_MSTR_CTRL=m -CONFIG_SND_SOC_QDSP6V2=m -CONFIG_SND_SOC_WCD_MBHC_ADC=m -CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m -CONFIG_QTI_PP=m -CONFIG_SND_HWDEP_ROUTING=m -CONFIG_SND_SOC_MSM_STUB=m -CONFIG_MSM_AVTIMER=m -CONFIG_SND_SOC_BOLERO=m -CONFIG_WSA_MACRO=m -CONFIG_VA_MACRO=m -CONFIG_RX_MACRO=m -CONFIG_TX_MACRO=m -CONFIG_SND_SOC_WCD_IRQ=m -CONFIG_SND_SOC_WCD938X=m -CONFIG_SND_SOC_WCD938X_SLAVE=m -CONFIG_SND_SOC_KONA=m -CONFIG_SND_EVENT=m -CONFIG_VOICE_MHI=m +export CONFIG_PINCTRL_LPI=m +export CONFIG_PINCTRL_WCD=m +export CONFIG_AUDIO_EXT_CLK=m +export CONFIG_SND_SOC_WCD9XXX_V2=m +export CONFIG_SND_SOC_WCD_MBHC=m +export CONFIG_SND_SOC_WSA881X=m +export CONFIG_WCD9XXX_CODEC_CORE_V2=m +export CONFIG_MSM_CDC_PINCTRL=m +export CONFIG_MSM_QDSP6V2_CODECS=m +export CONFIG_MSM_ULTRASOUND=m +export CONFIG_MSM_QDSP6_APRV2_RPMSG=m +export CONFIG_MSM_ADSP_LOADER=m +export CONFIG_REGMAP_SWR=m +export CONFIG_MSM_QDSP6_SSR=m +export CONFIG_MSM_QDSP6_PDR=m +export CONFIG_MSM_QDSP6_NOTIFIER=m +export CONFIG_SND_SOC_MSM_HOSTLESS_PCM=m +export CONFIG_SND_SOC_MSM_QDSP6V2_INTF=m +export CONFIG_SOUNDWIRE=m +export CONFIG_SOUNDWIRE_MSTR_CTRL=m +export CONFIG_SND_SOC_QDSP6V2=m +export CONFIG_SND_SOC_WCD_MBHC_ADC=m +export CONFIG_SND_SOC_MSM_HDMI_CODEC_RX=m +export CONFIG_QTI_PP=m +export CONFIG_SND_HWDEP_ROUTING=m +export CONFIG_SND_SOC_MSM_STUB=m +export CONFIG_MSM_AVTIMER=m +export CONFIG_SND_SOC_BOLERO=m +export CONFIG_WSA_MACRO=m +export CONFIG_VA_MACRO=m +export CONFIG_RX_MACRO=m +export CONFIG_TX_MACRO=m +export CONFIG_SND_SOC_WCD_IRQ=m +export CONFIG_SND_SOC_WCD938X=m +export CONFIG_SND_SOC_WCD938X_SLAVE=m +export CONFIG_SND_SOC_KONA=m +export CONFIG_SND_EVENT=m +export CONFIG_VOICE_MHI=m diff --git a/dsp/Kbuild b/dsp/Kbuild index cf9de150f4..086924f555 100644 --- a/dsp/Kbuild +++ b/dsp/Kbuild @@ -26,7 +26,6 @@ ifeq ($(KERNEL_BUILD), 0) endif ifeq ($(CONFIG_ARCH_KONA), y) include $(AUDIO_ROOT)/config/konaauto.conf - export INCS += -include $(AUDIO_ROOT)/config/konaautoconf.h endif ifeq ($(CONFIG_ARCH_LITO), y) diff --git a/dsp/codecs/Kbuild b/dsp/codecs/Kbuild index b4be4852ab..d78675f54f 100644 --- a/dsp/codecs/Kbuild +++ b/dsp/codecs/Kbuild @@ -26,7 +26,6 @@ ifeq ($(KERNEL_BUILD), 0) endif ifeq ($(CONFIG_ARCH_KONA), y) include $(AUDIO_ROOT)/config/konaauto.conf - export INCS += -include $(AUDIO_ROOT)/config/konaautoconf.h endif ifeq ($(CONFIG_ARCH_LITO), y) diff --git a/ipc/Kbuild b/ipc/Kbuild index 2da5fbd317..fb0974e6a4 100644 --- a/ipc/Kbuild +++ b/ipc/Kbuild @@ -27,7 +27,6 @@ ifeq ($(KERNEL_BUILD), 0) endif ifeq ($(CONFIG_ARCH_KONA), y) include $(AUDIO_ROOT)/config/konaauto.conf - export INCS += -include $(AUDIO_ROOT)/config/konaautoconf.h endif ifeq ($(CONFIG_ARCH_LITO), y) diff --git a/soc/Kbuild b/soc/Kbuild index f5f5c8b347..a1944a15fd 100644 --- a/soc/Kbuild +++ b/soc/Kbuild @@ -21,7 +21,6 @@ ifeq ($(KERNEL_BUILD), 0) endif ifeq ($(CONFIG_ARCH_KONA), y) include $(AUDIO_ROOT)/config/konaauto.conf - export INCS += -include $(AUDIO_ROOT)/config/konaautoconf.h endif ifeq ($(CONFIG_ARCH_LITO), y)