blob: 158ce916fd9a4169ded13a4fdf0663df35fc5c7e (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
diff --cc arch/arm/Kconfig
index b67e45a,74538c6..0000000
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -1706,6 -1614,24 +1706,27 @@@ config BIG_LITTL
help
This option enables support for the big.LITTLE architecture.
++<<<<<<< HEAD
++=======
+ config BL_SWITCHER
+ bool "big.LITTLE switcher support"
+ depends on BIG_LITTLE && MCPM && HOTPLUG_CPU
+ select CPU_PM
+ select ARM_CPU_SUSPEND
+ help
+ The big.LITTLE "switcher" provides the core functionality to
+ transparently handle transition between a cluster of A15's
+ and a cluster of A7's in a big.LITTLE system.
+
+ config BL_SWITCHER_DUMMY_IF
+ tristate "Simple big.LITTLE switcher user interface"
+ depends on BL_SWITCHER && DEBUG_KERNEL
+ help
+ This is a simple and dummy char dev interface to control
+ the big.LITTLE switcher core code. It is meant for
+ debugging purposes only.
+
++>>>>>>> tracking-iks
choice
prompt "Memory split"
default VMSPLIT_3G
|
