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

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

Merge "msm: Remove Kconfig options for unsupported platforms"

parents fc7c682f b3270aa9

arch/arm/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -1412,7 +1412,7 @@ config ARM_ERRATA_798181 


config KSAPI

        tristate "KSAPI support (EXPERIMENTAL)"

	depends on ARCH_MSM_SCORPION || ARCH_MSM_KRAIT

	depends on ARCH_MSM_KRAIT

        default n

        help

          KSAPI: Performance monitoring tool for linux.
@@ -2379,7 +2379,7 @@ menu "Power management options" 
source "kernel/power/Kconfig"



config ARCH_SUSPEND_POSSIBLE

	depends on !ARCH_S5PC100 && !ARCH_FSM9XXX

	depends on !ARCH_S5PC100

	depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \

		CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE || CPU_MOHAWK

	def_bool y

arch/arm/mach-msm/Kconfig

+4 −1303

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mm/Kconfig

+0 −13
Original line number Diff line number Diff line
@@ -737,19 +737,6 @@ config CPU_DCACHE_SIZE 
	  If your SoC is configured to have a different size, define the value

	  here with proper conditions.



config CPU_CACHE_ERR_REPORT

	bool "Report errors in the L1 and L2 caches"

	depends on ARCH_MSM_SCORPION

	default n

	help

	  The Scorpion processor supports reporting L2 errors, L1 icache parity

	  errors, and L1 dcache parity errors as imprecise external aborts. If

	  this option is not enabled these errors will go unreported and data

	  corruption will occur.



	  Say Y here to have errors in the L1 and L2 caches reported as

	  imprecise data aborts.



config CPU_DCACHE_WRITETHROUGH

	bool "Force write through D-cache"

	depends on (CPU_ARM740T || CPU_ARM920T || CPU_ARM922T || CPU_ARM925T || CPU_ARM926T || CPU_ARM940T || CPU_ARM946E || CPU_ARM1020 || CPU_FA526) && !CPU_DCACHE_DISABLE