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

Commit 91470e42 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: Add missing config in arm for msm8937/msm8953"

parents 503a1875 58b276b1

arch/arm/configs/msm8937_defconfig

+5 −0
Original line number Original line Diff line number Diff line
@@ -553,6 +553,7 @@ CONFIG_QCOM_LAZY_MAPPING=y 
CONFIG_IOMMU_DEBUG=y

CONFIG_IOMMU_DEBUG=y

CONFIG_IOMMU_DEBUG_TRACKING=y

CONFIG_IOMMU_DEBUG_TRACKING=y

CONFIG_IOMMU_TESTS=y

CONFIG_IOMMU_TESTS=y

CONFIG_QCOM_CPUSS_DUMP=y

CONFIG_QCOM_RUN_QUEUE_STATS=y

CONFIG_QCOM_RUN_QUEUE_STATS=y

CONFIG_MSM_SPM=y

CONFIG_MSM_SPM=y

CONFIG_MSM_L2_SPM=y

CONFIG_MSM_L2_SPM=y
@@ -561,6 +562,7 @@ CONFIG_MSM_CORE_HANG_DETECT=y 
CONFIG_MSM_GLADIATOR_HANG_DETECT=y

CONFIG_MSM_GLADIATOR_HANG_DETECT=y

CONFIG_QCOM_WATCHDOG_V2=y

CONFIG_QCOM_WATCHDOG_V2=y

CONFIG_QCOM_MEMORY_DUMP_V2=y

CONFIG_QCOM_MEMORY_DUMP_V2=y

CONFIG_MSM_DEBUG_LAR_UNLOCK=y

CONFIG_MSM_RPM_SMD=y

CONFIG_MSM_RPM_SMD=y

CONFIG_QCOM_BUS_SCALING=y

CONFIG_QCOM_BUS_SCALING=y

CONFIG_QCOM_SECURE_BUFFER=y

CONFIG_QCOM_SECURE_BUFFER=y
@@ -631,6 +633,8 @@ CONFIG_MAGIC_SYSRQ=y 
CONFIG_DEBUG_PAGEALLOC=y

CONFIG_DEBUG_PAGEALLOC=y

CONFIG_SLUB_DEBUG_PANIC_ON=y

CONFIG_SLUB_DEBUG_PANIC_ON=y

CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT=y

CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT=y

CONFIG_PAGE_POISONING=y

CONFIG_PAGE_POISONING_ENABLE_DEFAULT=y

CONFIG_DEBUG_OBJECTS=y

CONFIG_DEBUG_OBJECTS=y

CONFIG_DEBUG_OBJECTS_FREE=y

CONFIG_DEBUG_OBJECTS_FREE=y

CONFIG_DEBUG_OBJECTS_TIMERS=y

CONFIG_DEBUG_OBJECTS_TIMERS=y
@@ -672,6 +676,7 @@ CONFIG_LKDTM=y 
CONFIG_MEMTEST=y

CONFIG_MEMTEST=y

CONFIG_PANIC_ON_DATA_CORRUPTION=y

CONFIG_PANIC_ON_DATA_CORRUPTION=y

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_USER=y

CONFIG_FORCE_PAGES=y

CONFIG_PID_IN_CONTEXTIDR=y

CONFIG_PID_IN_CONTEXTIDR=y

CONFIG_DEBUG_SET_MODULE_RONX=y

CONFIG_DEBUG_SET_MODULE_RONX=y

CONFIG_CORESIGHT=y

CONFIG_CORESIGHT=y

arch/arm/configs/msm8953_defconfig

+5 −0
Original line number Original line Diff line number Diff line
@@ -558,6 +558,7 @@ CONFIG_QCOM_LAZY_MAPPING=y 
CONFIG_IOMMU_DEBUG=y

CONFIG_IOMMU_DEBUG=y

CONFIG_IOMMU_DEBUG_TRACKING=y

CONFIG_IOMMU_DEBUG_TRACKING=y

CONFIG_IOMMU_TESTS=y

CONFIG_IOMMU_TESTS=y

CONFIG_QCOM_CPUSS_DUMP=y

CONFIG_QCOM_RUN_QUEUE_STATS=y

CONFIG_QCOM_RUN_QUEUE_STATS=y

CONFIG_MSM_SPM=y

CONFIG_MSM_SPM=y

CONFIG_MSM_L2_SPM=y

CONFIG_MSM_L2_SPM=y
@@ -566,6 +567,7 @@ CONFIG_MSM_CORE_HANG_DETECT=y 
CONFIG_MSM_GLADIATOR_HANG_DETECT=y

CONFIG_MSM_GLADIATOR_HANG_DETECT=y

CONFIG_QCOM_WATCHDOG_V2=y

CONFIG_QCOM_WATCHDOG_V2=y

CONFIG_QCOM_MEMORY_DUMP_V2=y

CONFIG_QCOM_MEMORY_DUMP_V2=y

CONFIG_MSM_DEBUG_LAR_UNLOCK=y

CONFIG_MSM_RPM_SMD=y

CONFIG_MSM_RPM_SMD=y

CONFIG_QCOM_BUS_SCALING=y

CONFIG_QCOM_BUS_SCALING=y

CONFIG_QCOM_SECURE_BUFFER=y

CONFIG_QCOM_SECURE_BUFFER=y
@@ -632,6 +634,8 @@ CONFIG_MAGIC_SYSRQ=y 
CONFIG_DEBUG_PAGEALLOC=y

CONFIG_DEBUG_PAGEALLOC=y

CONFIG_SLUB_DEBUG_PANIC_ON=y

CONFIG_SLUB_DEBUG_PANIC_ON=y

CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT=y

CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT=y

CONFIG_PAGE_POISONING=y

CONFIG_PAGE_POISONING_ENABLE_DEFAULT=y

CONFIG_DEBUG_OBJECTS=y

CONFIG_DEBUG_OBJECTS=y

CONFIG_DEBUG_OBJECTS_FREE=y

CONFIG_DEBUG_OBJECTS_FREE=y

CONFIG_DEBUG_OBJECTS_TIMERS=y

CONFIG_DEBUG_OBJECTS_TIMERS=y
@@ -673,6 +677,7 @@ CONFIG_LKDTM=y 
CONFIG_MEMTEST=y

CONFIG_MEMTEST=y

CONFIG_PANIC_ON_DATA_CORRUPTION=y

CONFIG_PANIC_ON_DATA_CORRUPTION=y

CONFIG_DEBUG_USER=y

CONFIG_DEBUG_USER=y

CONFIG_FORCE_PAGES=y

CONFIG_PID_IN_CONTEXTIDR=y

CONFIG_PID_IN_CONTEXTIDR=y

CONFIG_DEBUG_SET_MODULE_RONX=y

CONFIG_DEBUG_SET_MODULE_RONX=y

CONFIG_CORESIGHT=y

CONFIG_CORESIGHT=y