diff options
Diffstat (limited to 'solutions')
4 files changed, 81 insertions, 0 deletions
diff --git a/solutions/9c565655cf758901ae9034e970320b1b/conflict1 b/solutions/9c565655cf758901ae9034e970320b1b/conflict1 new file mode 100644 index 0000000..158ce91 --- /dev/null +++ b/solutions/9c565655cf758901ae9034e970320b1b/conflict1 @@ -0,0 +1,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 diff --git a/solutions/9c565655cf758901ae9034e970320b1b/conflict2 b/solutions/9c565655cf758901ae9034e970320b1b/conflict2 new file mode 100644 index 0000000..c16e027 --- /dev/null +++ b/solutions/9c565655cf758901ae9034e970320b1b/conflict2 @@ -0,0 +1,16 @@ +diff --cc arch/arm/common/Makefile +index bd48ab5,d35f28a..0000000 +--- a/arch/arm/common/Makefile ++++ b/arch/arm/common/Makefile +@@@ -12,4 -12,7 +12,11 @@@ obj-$(CONFIG_SHARP_SCOOP) += scoop. + obj-$(CONFIG_PCI_HOST_ITE8152) += it8152.o + obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o + obj-$(CONFIG_MCPM) += mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o +++<<<<<<< HEAD + +CFLAGS_REMOVE_mcpm_entry.o = -pg +++======= ++ AFLAGS_mcpm_head.o := -march=armv7-a ++ AFLAGS_vlock.o := -march=armv7-a ++ obj-$(CONFIG_BL_SWITCHER) += bL_switcher.o ++ obj-$(CONFIG_BL_SWITCHER_DUMMY_IF) += bL_switcher_dummy_if.o +++>>>>>>> tracking-iks diff --git a/solutions/9c565655cf758901ae9034e970320b1b/solution1 b/solutions/9c565655cf758901ae9034e970320b1b/solution1 new file mode 100644 index 0000000..4315f3b --- /dev/null +++ b/solutions/9c565655cf758901ae9034e970320b1b/solution1 @@ -0,0 +1,19 @@ +--- /home/ynk/git.linaro.org/linux-linaro-stable.manifest/solutions/9c565655cf758901ae9034e970320b1b/arch-arm-Kconfig.orig 2013-05-22 15:52:18.528432695 +0400 ++++ arch/arm/Kconfig 2013-05-22 15:53:04.756433076 +0400 +@@ -1706,8 +1706,6 @@ config BIG_LITTLE + 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 +@@ -1726,7 +1724,6 @@ config BL_SWITCHER_DUMMY_IF + the big.LITTLE switcher core code. It is meant for + debugging purposes only. + +->>>>>>> tracking-iks + choice + prompt "Memory split" + default VMSPLIT_3G diff --git a/solutions/9c565655cf758901ae9034e970320b1b/solution2 b/solutions/9c565655cf758901ae9034e970320b1b/solution2 new file mode 100644 index 0000000..5e53c7f --- /dev/null +++ b/solutions/9c565655cf758901ae9034e970320b1b/solution2 @@ -0,0 +1,14 @@ +--- /home/ynk/git.linaro.org/linux-linaro-stable.manifest/solutions/9c565655cf758901ae9034e970320b1b/arch-arm-common-Makefile.orig 2013-05-22 15:53:04.848433078 +0400 ++++ arch/arm/common/Makefile 2013-05-22 16:10:31.888441743 +0400 +@@ -12,11 +12,8 @@ obj-$(CONFIG_SHARP_SCOOP) += scoop.o + obj-$(CONFIG_PCI_HOST_ITE8152) += it8152.o + obj-$(CONFIG_ARM_TIMER_SP804) += timer-sp.o + obj-$(CONFIG_MCPM) += mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o +-<<<<<<< HEAD + CFLAGS_REMOVE_mcpm_entry.o = -pg +-======= + AFLAGS_mcpm_head.o := -march=armv7-a + AFLAGS_vlock.o := -march=armv7-a + obj-$(CONFIG_BL_SWITCHER) += bL_switcher.o + obj-$(CONFIG_BL_SWITCHER_DUMMY_IF) += bL_switcher_dummy_if.o +->>>>>>> tracking-iks |