Evolution-X-Devices/kernel_nothing_sm7325
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

modules: Allow Yupik and Shima to build without ARCH_LAHAINA

Browse Source 
Change-Id: I965f994c83723709ae340ee8d4a4d4145b0f9a49
This commit is contained in:
Jake Weinstein
2022-08-16 06:27:46 +09:00
committed by Wiktor Rudzki
parent e91e9cce51
commit a1df06de62
10 changed files with 17 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
arch/arm64/boot/dts/vendor/qcom/Makefile vendored
View File

@@ -221,39 +221,9 @@ endif
ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)
dtbo-$(CONFIG_ARCH_YUPIK) += \
yupik-rumi-overlay.dtbo \
yupik-idp-overlay.dtbo \
yupik-atp-overlay.dtbo \
yupik-qrd-overlay.dtbo \
yupik-qrd-pm7250b-overlay.dtbo \
yupik-idps-amoled-overlay.dtbo \
yupik-idp-pm7250b-overlay.dtbo \
yupik-idp-hsp-overlay.dtbo \
yupikp-idp-overlay.dtbo \
yupikp-atp-overlay.dtbo \
yupikp-qrd-overlay.dtbo \
yupikp-idps-amoled-overlay.dtbo \
yupikp-idp-hsp-overlay.dtbo \
yupik-iot-idp-overlay.dtbo \
yupik-iot-idp-pm7250b-overlay.dtbo \
yupik-iot-qrd-overlay.dtbo \
yupik-iot-hsp-overlay.dtbo \
yupik-iot-hsp-pm7250b-overlay.dtbo \
katmai-hsp-overlay.dtbo \
katmai-hsp-pm7250b-overlay.dtbo \
katmai-fp2-hsp-overlay.dtbo \
katmai-fp2-hsp-pm7250b-overlay.dtbo \
yupik-iot-idps-amoled-overlay.dtbo \
yupikp-iot-idp-overlay.dtbo \
yupikp-iot-idp-pm7250b-overlay.dtbo \
yupikp-iot-qrd-overlay.dtbo \
yupikp-iot-hsp-overlay.dtbo \
yupikp-iot-hsp-pm7250b-overlay.dtbo \
katmaip-hsp-overlay.dtbo \
katmaip-hsp-pm7250b-overlay.dtbo \
katmaip-fp2-hsp-overlay.dtbo \
katmaip-fp2-hsp-pm7250b-overlay.dtbo \
yupikp-iot-idps-amoled-overlay.dtbo
yupik-rumi-overlay.dtbo-base := yupik.dtb

2
drivers/gpu/msm/Kconfig
View File

@@ -46,7 +46,7 @@ config QCOM_KGSL_CORESIGHT
config QCOM_KGSL_IOCOHERENCY_DEFAULT
bool "Enable I/O coherency on cached GPU memory by default"
depends on QCOM_KGSL
default y if ARCH_LAHAINA
default y if (ARCH_LAHAINA || ARCH_SHIMA || ARCH_YUPIK)
help
Say 'Y' here to enable I/O cache coherency by default on targets that
support hardware I/O coherency. If enabled all cached GPU memory

4
drivers/soc/qcom/Kconfig
View File

@@ -909,13 +909,13 @@ config QTI_HW_MEMLAT
config QTI_HW_NUM_AMU
int
default 7 if ARCH_LAHAINA && QTI_HW_MEMLAT
default 7 if (ARCH_LAHAINA || ARCH_SHIMA || ARCH_YUPIK) && QTI_HW_MEMLAT
default 5 if ARCH_HOLI && QTI_HW_MEMLAT
default 5
config QTI_HW_NUM_PMU
int
default 6 if (ARCH_LAHAINA || ARCH_HOLI) && QTI_HW_MEMLAT
default 6 if (ARCH_LAHAINA || ARCH_SHIMA || ARCH_YUPIK || ARCH_HOLI) && QTI_HW_MEMLAT
default 6
config QTI_HW_MEMLAT_SCMI_CLIENT

10
drivers/staging/qcacld-3.0/configs/default_defconfig
View File

@@ -51,7 +51,7 @@ ifeq ($(CONFIG_CNSS_QCA6490), y)
CONFIG_WLAN_TWT_SAP_STA_COUNT := y
CONFIG_WLAN_TWT_SAP_PDEV_COUNT := y
CONFIG_DUMP_REO_QUEUE_INFO_IN_DDR :=y
ifeq ($(CONFIG_ARCH_LAHAINA), y)
ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
CONFIG_WLAN_TSF_UPLINK_DELAY := y
endif
endif
@@ -76,7 +76,7 @@ ifeq ($(CONFIG_CNSS_QCA6750), y)
CONFIG_HOST_WAKEUP_OVER_QMI := y
CONFIG_WLAN_FEATURE_WMI_DIAG_OVER_CE7 := y
CONFIG_WLAN_DP_FEATURE_DEFERRED_REO_QDESC_DESTROY := y
ifeq ($(CONFIG_ARCH_LAHAINA), y)
ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
CONFIG_WLAN_TSF_UPLINK_DELAY := y
endif
endif
@@ -302,7 +302,7 @@ endif
CONFIG_WLAN_SYNC_TSF_TIMER := y
endif
ifeq ($(CONFIG_ARCH_LAHAINA), y)
ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
CONFIG_QCACLD_FEATURE_METERING := y
CONFIG_WDI3_STATS_UPDATE := y
ifeq ($(CONFIG_CNSS_QCA6490), y)
@@ -863,7 +863,7 @@ CONFIG_SMMU_S1_UNMAP := y
endif
endif
ifeq ($(CONFIG_ARCH_LAHAINA), y)
ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
ifeq ($(CONFIG_IPA_OFFLOAD), y)
CONFIG_ENABLE_SMMU_S1_TRANSLATION := y
CONFIG_SMMU_S1_UNMAP := y
@@ -1203,7 +1203,7 @@ CONFIG_WLAN_FEATURE_PKT_CAPTURE := y
endif
ifeq ($(CONFIG_CNSS_QCA6490), y)
ifeq ($(CONFIG_ARCH_LAHAINA), y)
ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
CONFIG_WLAN_FEATURE_PKT_CAPTURE := y
CONFIG_WLAN_FEATURE_PKT_CAPTURE_V2 := y
CONFIG_DP_RX_UDP_OVER_PEER_ROAM := y

6
drivers/staging/qcacld-3.0/configs/wear_defconfig
View File

@@ -291,7 +291,7 @@ endif
CONFIG_WLAN_SYNC_TSF_TIMER := y
endif
ifeq ($(CONFIG_ARCH_LAHAINA), y)
ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
CONFIG_QCACLD_FEATURE_METERING := y
CONFIG_WDI3_STATS_UPDATE := y
ifeq ($(CONFIG_CNSS_QCA6490), y)
@@ -852,7 +852,7 @@ CONFIG_SMMU_S1_UNMAP := y
endif
endif
ifeq ($(CONFIG_ARCH_LAHAINA), y)
ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
ifeq ($(CONFIG_IPA_OFFLOAD), y)
CONFIG_ENABLE_SMMU_S1_TRANSLATION := y
CONFIG_SMMU_S1_UNMAP := y
@@ -1198,7 +1198,7 @@ CONFIG_WLAN_FEATURE_PKT_CAPTURE := y
endif
ifeq ($(CONFIG_CNSS_QCA6490), y)
ifeq ($(CONFIG_ARCH_LAHAINA), y)
ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
CONFIG_WLAN_FEATURE_PKT_CAPTURE := y
CONFIG_WLAN_FEATURE_PKT_CAPTURE_V2 := y
endif

4
techpack/audio/Makefile
View File

@@ -18,7 +18,7 @@ endif
ifeq ($(CONFIG_ARCH_KONA), y)
include $(srctree)/techpack/audio/config/konaauto.conf
endif
ifeq ($(CONFIG_ARCH_LAHAINA), y)
ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
include $(srctree)/techpack/audio/config/lahainaauto.conf
endif
ifeq ($(CONFIG_ARCH_HOLI), y)
@@ -66,7 +66,7 @@ ifeq ($(CONFIG_ARCH_KONA), y)
LINUXINCLUDE += \
-include $(srctree)/techpack/audio/config/konaautoconf.h
endif
ifeq ($(CONFIG_ARCH_LAHAINA), y)
ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
LINUXINCLUDE += \
-include $(srctree)/techpack/audio/config/lahainaautoconf.h
endif

2
techpack/audio/asoc/codecs/wsa883x/Kbuild
View File

@@ -14,7 +14,7 @@ ifeq ($(KERNEL_BUILD), 1)
endif
ifeq ($(KERNEL_BUILD), 0)
ifeq ($(CONFIG_ARCH_LAHAINA), y)
ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
include $(AUDIO_ROOT)/config/lahainaauto.conf
export
INCS += -include $(AUDIO_ROOT)/config/lahainaautoconf.h

2
techpack/dataipa/drivers/platform/msm/Makefile
View File

@@ -1,6 +1,6 @@
# SPDX-License-Identifier: GPL-2.0-only
ifeq ($(CONFIG_ARCH_LAHAINA), y)
ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
LINUXINCLUDE += -include $(srctree)/techpack/dataipa/config/dataipa.h
ifeq ($(CONFIG_QGKI),y)
include $(srctree)/techpack/dataipa/config/dataipa_QGKI.conf

2
techpack/display/Makefile
View File

@@ -11,7 +11,7 @@ LINUXINCLUDE += -include $(srctree)/techpack/display/config/gki_konadispconf.
endif
endif
ifeq ($(CONFIG_ARCH_LAHAINA), y)
ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
ifeq ($(CONFIG_QGKI), y)
include $(srctree)/techpack/display/config/lahainadisp.conf
LINUXINCLUDE += -include $(srctree)/techpack/display/config/lahainadispconf.h

2
techpack/video/Makefile
View File

@@ -2,7 +2,7 @@
# auto-detect subdirs
ifneq ($(CONFIG_ARCH_QTI_VM), y)
ifeq ($(CONFIG_ARCH_LAHAINA), y)
ifneq ($(filter y, $(CONFIG_ARCH_LAHAINA) $(CONFIG_ARCH_SHIMA) $(CONFIG_ARCH_YUPIK)),)
include $(srctree)/techpack/video/config/konavid.conf
LINUXINCLUDE += -include $(srctree)/techpack/video/config/konavidconf.h
endif