audio: update kernel version reference

Update kernel version references from 4.19 to 5.4.
Update symbolic links to new kernel version files.

Change-Id: I38baa52218b16e0b0c86ad898912d29ec4d3d516
Signed-off-by: Vignesh Kulothungan <vigneshk@codeaurora.org>
This commit is contained in:
Vignesh Kulothungan
2019-12-06 17:46:51 -08:00
parent 231edb7422
commit d71ec81bb0
16 changed files with 29 additions and 29 deletions

View File

@@ -9,7 +9,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-based builds # Need to explicitly configure for Android-based builds
AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.19 AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-5.4
AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif
@@ -95,7 +95,7 @@ endif
# config. # config.
############ UAPI ############ ############ UAPI ############
UAPI_DIR := uapi UAPI_DIR := uapi/audio
UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR)
############ COMMON ############ ############ COMMON ############

View File

@@ -9,7 +9,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-based builds # Need to explicitly configure for Android-based builds
AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.19 AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-5.4
AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif
@@ -89,7 +89,7 @@ endif
# config. # config.
############ UAPI ############ ############ UAPI ############
UAPI_DIR := uapi UAPI_DIR := uapi/audio
UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR)
############ COMMON ############ ############ COMMON ############

View File

@@ -9,7 +9,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-based builds # Need to explicitly configure for Android-based builds
AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.19 AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-5.4
AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif
@@ -53,7 +53,7 @@ endif
# config. # config.
############ UAPI ############ ############ UAPI ############
UAPI_DIR := uapi UAPI_DIR := uapi/audio
UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR)
############ COMMON ############ ############ COMMON ############

View File

@@ -11,7 +11,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-based builds # Need to explicitly configure for Android-based builds
AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.19 AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-5.4
AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif
@@ -64,7 +64,7 @@ endif
# config. # config.
############ UAPI ############ ############ UAPI ############
UAPI_DIR := uapi UAPI_DIR := uapi/audio
UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR)
############ COMMON ############ ############ COMMON ############

View File

@@ -10,7 +10,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-based builds # Need to explicitly configure for Android-based builds
AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.19 AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-5.4
AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif
@@ -39,7 +39,7 @@ endif
# config. # config.
############ UAPI ############ ############ UAPI ############
UAPI_DIR := uapi UAPI_DIR := uapi/audio
UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR)
############ COMMON ############ ############ COMMON ############

View File

@@ -11,7 +11,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-based builds # Need to explicitly configure for Android-based builds
AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.19 AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-5.4
AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif
@@ -40,7 +40,7 @@ endif
# config. # config.
############ UAPI ############ ############ UAPI ############
UAPI_DIR := uapi UAPI_DIR := uapi/audio
UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR)
############ COMMON ############ ############ COMMON ############

View File

@@ -11,7 +11,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-based builds # Need to explicitly configure for Android-based builds
AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.19 AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-5.4
AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif
@@ -55,7 +55,7 @@ endif
# config. # config.
############ UAPI ############ ############ UAPI ############
UAPI_DIR := uapi UAPI_DIR := uapi/audio
UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR)
############ COMMON ############ ############ COMMON ############

View File

@@ -11,7 +11,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-based builds # Need to explicitly configure for Android-based builds
AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-4.19 AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/kernel/msm-5.4
AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif
@@ -50,7 +50,7 @@ endif
# config. # config.
############ UAPI ############ ############ UAPI ############
UAPI_DIR := uapi UAPI_DIR := uapi/audio
UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR)
############ COMMON ############ ############ COMMON ############

View File

@@ -9,7 +9,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-based builds # Need to explicitly configure for Android-based builds
AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.19 AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-5.4
AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif
@@ -43,7 +43,7 @@ endif
# config. # config.
############ UAPI ############ ############ UAPI ############
UAPI_DIR := uapi UAPI_DIR := uapi/audio
UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR)
############ COMMON ############ ############ COMMON ############

View File

@@ -9,7 +9,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-based builds # Need to explicitly configure for Android-based builds
AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.19 AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-5.4
AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif
@@ -37,7 +37,7 @@ endif
# config. # config.
############ UAPI ############ ############ UAPI ############
UAPI_DIR := uapi UAPI_DIR := uapi/audio
UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR)
############ COMMON ############ ############ COMMON ############

View File

@@ -9,7 +9,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-based builds # Need to explicitly configure for Android-based builds
AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.19 AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-5.4
AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif
@@ -97,7 +97,7 @@ endif
# config. # config.
############ UAPI ############ ############ UAPI ############
UAPI_DIR := uapi UAPI_DIR := uapi/audio/
UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR)
############ COMMON ############ ############ COMMON ############

View File

@@ -1 +1 @@
../../../../../../kernel/msm-4.19/drivers/base/regmap/internal.h ../../../../../../kernel/msm-5.4/drivers/base/regmap/internal.h

View File

@@ -8,7 +8,7 @@ endif
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-based builds # Need to explicitly configure for Android-based builds
KDIR := $(TOP)/kernel/msm-4.19 KDIR := $(TOP)/kernel/msm-5.4
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
AUDIO_ROOT := $(KDIR)/techpack/audio AUDIO_ROOT := $(KDIR)/techpack/audio
@@ -96,7 +96,7 @@ endif
# config. # config.
############ UAPI ############ ############ UAPI ############
UAPI_DIR := uapi UAPI_DIR := uapi/audio
UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR)
############ COMMON ############ ############ COMMON ############

View File

@@ -9,7 +9,7 @@ endif
ifeq ($(KERNEL_BUILD), 1) ifeq ($(KERNEL_BUILD), 1)
# These are configurable via Kconfig for kernel-based builds # These are configurable via Kconfig for kernel-based builds
# Need to explicitly configure for Android-based builds # Need to explicitly configure for Android-based builds
AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-4.19 AUDIO_BLD_DIR := $(shell pwd)/kernel/msm-5.4
AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio AUDIO_ROOT := $(AUDIO_BLD_DIR)/techpack/audio
endif endif
@@ -95,7 +95,7 @@ endif
# config. # config.
############ UAPI ############ ############ UAPI ############
UAPI_DIR := uapi UAPI_DIR := uapi/audio
UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR) UAPI_INC := -I$(AUDIO_ROOT)/include/$(UAPI_DIR)
############ COMMON ############ ############ COMMON ############

View File

@@ -1 +1 @@
../../../../../kernel/msm-4.19/drivers/pinctrl/core.h ../../../../../kernel/msm-5.4/drivers/pinctrl/core.h

View File

@@ -1 +1 @@
../../../../../kernel/msm-4.19/drivers/pinctrl/pinctrl-utils.h ../../../../../kernel/msm-5.4/drivers/pinctrl/pinctrl-utils.h