Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 56b8382c authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge ".gitignore: ignore GKI generated defconfigs"

parents 5c48d77d 870624be
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ x509.genkey
arch/*/configs/vendor/*-gki_defconfig
arch/*/configs/vendor/*-qgki_defconfig
arch/*/configs/vendor/*-qgki-debug_defconfig
arch/*/configs/vendor/*-qgki-consolidate_defconfig

# vendor device tree directories
arch/arm64/boot/dts/vendor
+46 −0
Original line number Diff line number Diff line
CONFIG_LOCALVERSION="-qgki-consolidate"
CONFIG_IOMMU_TLBSYNC_DEBUG=y
CONFIG_IOMMU_DEBUG=y
CONFIG_IOMMU_TESTS=y
CONFIG_CMA_DEBUGFS=y
CONFIG_CMA_DEBUG=y
CONFIG_DEBUG_PAGEALLOC=y
CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT=y
CONFIG_PAGE_OWNER=y
CONFIG_PAGE_OWNER_ENABLE_DEFAULT=y
CONFIG_PAGE_EXTENSION_PAGE_FREE=y
# CONFIG_DEBUG_DMA_BUF_REF is not set
CONFIG_EDAC_KRYO_ARM64_PANIC_ON_CE=y
CONFIG_QMP_DEBUGFS_CLIENT=y
CONFIG_ATOMIC64_SELFTEST=m
CONFIG_DETECT_HUNG_TASK=y
CONFIG_DEBUG_SPINLOCK=y
CONFIG_TEST_USER_COPY=m
CONFIG_OF_RESERVED_MEM_CHECK=y
CONFIG_BUG_ON_HW_MEM_ONLINE_FAIL=y
CONFIG_PANIC_ON_SCHED_BUG=y
CONFIG_PANIC_ON_RT_THROTTLING=y
CONFIG_LKDTM=m
CONFIG_RUNTIME_TESTING_MENU=y
CONFIG_PREEMPTIRQ_EVENTS=y
CONFIG_SERIAL_MSM_GENI_CONSOLE=y
CONFIG_QCOM_RTB=y
CONFIG_QCOM_RTB_SEPARATE_CPUS=y
CONFIG_DEBUG_CONSOLE_UNHASHED_POINTERS=y
CONFIG_COMMON_CLK_QCOM_DEBUG=y
CONFIG_CNSS2_DEBUG=y
CONFIG_NL80211_TESTMODE=y
CONFIG_EDAC_QCOM_LLCC_PANIC_ON_CE=y
CONFIG_LOCK_TORTURE_TEST=m
CONFIG_RCU_TORTURE_TEST=m
# CONFIG_CDNS_I3C_MASTER is not set
# CONFIG_DW_I3C_MASTER is not set
CONFIG_CORESIGHT_SOURCE_ETM4X=y
# CONFIG_CORESIGHT_CTI_SAVE_DISABLE is not set
CONFIG_MHI_DEBUG=y
CONFIG_MSM_DEBUGCC_LAHAINA=y
CONFIG_DEBUG_PANIC_ON_OOM=y
CONFIG_USB_F_FS_IPC_LOGGING=y
CONFIG_DYNAMIC_DEBUG=y
CONFIG_QTI_PMIC_GLINK_CLIENT_DEBUG=y
# CONFIG_HH_DISABLE_UART is not set
+5 −68
Original line number Diff line number Diff line
CONFIG_LOCALVERSION="-qgki-debug"
CONFIG_IOMMU_TLBSYNC_DEBUG=y
CONFIG_IOMMU_DEBUG=y
CONFIG_IOMMU_TESTS=y
CONFIG_CMA_DEBUGFS=y
CONFIG_CMA_DEBUG=y
CONFIG_SLUB_DEBUG_PANIC_ON=y
CONFIG_SLUB_DEBUG_ON=y
CONFIG_PAGE_OWNER=y
CONFIG_PAGE_OWNER_ENABLE_DEFAULT=y
CONFIG_DEBUG_PAGEALLOC=y
CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT=y
CONFIG_DEBUG_KMEMLEAK=y
CONFIG_DEBUG_KMEMLEAK_EARLY_LOG_SIZE=4000
CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF=y
CONFIG_PAGE_POISONING=y
CONFIG_PAGE_POISONING_ENABLE_DEFAULT=y
CONFIG_PAGE_EXTENSION_PAGE_FREE=y
# CONFIG_DEBUG_DMA_BUF_REF is not set
# CONFIG_PAGE_POISONING_NO_SANITY is not set
# CONFIG_PAGE_POISONING_ZERO is not set
CONFIG_EDAC_KRYO_ARM64_PANIC_ON_CE=y
CONFIG_QMP_DEBUGFS_CLIENT=y
CONFIG_LKDTM=m
CONFIG_ATOMIC64_SELFTEST=m
CONFIG_DETECT_HUNG_TASK=y
CONFIG_DEBUG_SPINLOCK=y
CONFIG_TEST_USER_COPY=m
CONFIG_OF_RESERVED_MEM_CHECK=y
CONFIG_BUG_ON_HW_MEM_ONLINE_FAIL=y
CONFIG_PANIC_ON_SCHED_BUG=y
CONFIG_PANIC_ON_RT_THROTTLING=y
CONFIG_LKDTM=m
CONFIG_RUNTIME_TESTING_MENU=y
CONFIG_PREEMPTIRQ_EVENTS=y
CONFIG_SERIAL_MSM_GENI=y
CONFIG_SERIAL_MSM_GENI_CONSOLE=y
CONFIG_MSM_GENI_SE=y
CONFIG_SERIAL_MSM_GENI_HALF_SAMPLING=y
CONFIG_QCOM_RTB=y
CONFIG_QCOM_RTB_SEPARATE_CPUS=y
CONFIG_MSM_QBT_HANDLER=y
CONFIG_DEBUG_CONSOLE_UNHASHED_POINTERS=y
CONFIG_COMMON_CLK_QCOM_DEBUG=y
CONFIG_I2C_MSM_GENI=y
CONFIG_SPI_MSM_GENI=y
CONFIG_CNSS2_DEBUG=y
CONFIG_NL80211_TESTMODE=y
CONFIG_MSM_GPI_DMA=y
CONFIG_MSM_GPI_DMA_DEBUG=y
CONFIG_EDAC_QCOM_LLCC_PANIC_ON_CE=y
CONFIG_LOCK_TORTURE_TEST=m
CONFIG_RCU_TORTURE_TEST=m
CONFIG_I3C=y
CONFIG_I3C_MASTER_MSM_GENI=y
# CONFIG_CDNS_I3C_MASTER is not set
# CONFIG_DW_I3C_MASTER is not set
CONFIG_CORESIGHT_SOURCE_ETM4X=y
# CONFIG_CORESIGHT_CTI_SAVE_DISABLE is not set
CONFIG_MHI_BUS=y
CONFIG_MHI_DEBUG=y
CONFIG_MHI_UCI=y
CONFIG_ARM_QCOM_CPUFREQ_HW=y
CONFIG_THERMAL_TSENS=y
# CONFIG_MSM_JTAGV8 is not set
CONFIG_SLIMBUS=y
CONFIG_SLIMBUS_MSM_NGD=y
CONFIG_QCOM_SMCINVOKE=y
CONFIG_MSM_DEBUGCC_LAHAINA=y
CONFIG_DEBUG_PANIC_ON_OOM=y
CONFIG_USB_F_FS_IPC_LOGGING=y
CONFIG_DYNAMIC_DEBUG=y
CONFIG_QTI_PMIC_GLINK_CLIENT_DEBUG=y
CONFIG_SPI_SPIDEV=y
CONFIG_I2C_CHARDEV=y
# CONFIG_HH_DISABLE_UART is not set
CONFIG_DEBUG_STACK_USAGE=y
CONFIG_DEBUG_MEMORY_INIT=y
+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ QCOM_GKI_FRAG=${CONFIGS_DIR}/${PLATFORM_NAME}_GKI.config
QCOM_QGKI_FRAG=${CONFIGS_DIR}/${PLATFORM_NAME}_QGKI.config
QCOM_DEBUG_FRAG=${CONFIGS_DIR}/${PLATFORM_NAME}_debug.config

# Consolidate fragment may not be present for all platforms.
QCOM_CONSOLIDATE_FRAG=`ls ${CONFIGS_DIR}/${PLATFORM_NAME}_consolidate.config 2> /dev/null`

QCOM_GENERIC_PERF_FRAG=${CONFIGS_DIR}/${PLATFORM_NAME}.config
QCOM_GENERIC_DEBUG_FRAG=${CONFIGS_DIR}/${PLATFORM_NAME}-debug.config

+5 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@

usage() {
	echo "Usage: $0 <platform_defconfig_variant>"
	echo "Variants: <platform>-gki_defconfig, <platform>-qgki_defconfig, and <platform>-qgki-debug_defconfig"
	echo "Variants: <platform>-gki_defconfig, <platform>-qgki_defconfig, <platform>-qgki-consolidate_defconfig and <platform>-qgki-debug_defconfig"
	echo "Example: $0 lahaina-gki_defconfig"
	exit 1
}
@@ -60,6 +60,9 @@ case "$REQUIRED_DEFCONFIG" in
	${PLATFORM_NAME}-qgki-debug_defconfig )
		FINAL_DEFCONFIG_BLEND+=" $QCOM_DEBUG_FRAG"
		;&	# Intentional fallthrough
	${PLATFORM_NAME}-qgki-consolidate_defconfig )
		FINAL_DEFCONFIG_BLEND+=" $QCOM_CONSOLIDATE_FRAG"
		;&	# Intentional fallthrough
	${PLATFORM_NAME}-qgki_defconfig )
		FINAL_DEFCONFIG_BLEND+=" $QCOM_QGKI_FRAG"
		${SCRIPTS_ROOT}/fragment_allyesconfig.sh $QCOM_GKI_FRAG $QCOM_GKI_ALLYES_FRAG
@@ -79,7 +82,7 @@ esac
FINAL_DEFCONFIG_BLEND+=${BASE_DEFCONFIG}

# Reverse the order of the configs for the override to work properly
# Correct order is base_defconfig GKI.config QGKI.config debug.config
# Correct order is base_defconfig GKI.config QGKI.config consolidate.config debug.config
FINAL_DEFCONFIG_BLEND=`echo "${FINAL_DEFCONFIG_BLEND}" | awk '{ for (i=NF; i>1; i--) printf("%s ",$i); print $1; }'`

echo "defconfig blend for $REQUIRED_DEFCONFIG: $FINAL_DEFCONFIG_BLEND"
Loading