commit ae1781455c10b6be723bc589c1a71f8f9cc54d06
author Linux Build Service Account <lnxbuild@localhost> Thu Jul 23 22:37:13 2015 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jul 23 22:37:13 2015 -0700
tree 895a26ea6749b2e7993098e338b615d5bf906067
parent 2a66735b5d65c6d2a6da31807480414648ba2327
parent e7a793910eef1eb3b34441911cc03da41a3d6d75

Merge "platform: msm8996: Enable write back cache"

platform/msm8996/platform.c

diff --git a/platform/msm8996/platform.c b/platform/msm8996/platform.c
index 633857a..6ec83d7 100644
--- a/platform/msm8996/platform.c
+++ b/platform/msm8996/platform.c
@@ -41,16 +41,16 @@
 #define MSM_IOMAP_SIZE     ((MSM_IOMAP_END - MSM_IOMAP_BASE)/MB)
 #define MSM_SHARED_SIZE    2
 
-/* LK memory - cacheable, write through */
-#define LK_MEMORY         (MMU_MEMORY_TYPE_NORMAL_WRITE_THROUGH | \
+/* LK memory - cacheable, write back */
+#define LK_MEMORY         (MMU_MEMORY_TYPE_NORMAL_WRITE_BACK_ALLOCATE | \
                            MMU_MEMORY_AP_READ_WRITE)
 
 /* Peripherals - non-shared device */
 #define IOMAP_MEMORY      (MMU_MEMORY_TYPE_DEVICE_SHARED | \
                            MMU_MEMORY_AP_READ_WRITE | MMU_MEMORY_XN | MMU_MEMORY_PXN)
 
-/* SCRATCH memory - cacheable, write through */
-#define SCRATCH_MEMORY       (MMU_MEMORY_TYPE_NORMAL_WRITE_THROUGH | \
+/* SCRATCH memory - cacheable, write back */
+#define SCRATCH_MEMORY       (MMU_MEMORY_TYPE_NORMAL_WRITE_BACK_ALLOCATE | \
                            MMU_MEMORY_AP_READ_WRITE | MMU_MEMORY_XN)
 
 /* COMMON memory - cacheable, write through */

platform/msm8996/rules.mk

diff --git a/platform/msm8996/rules.mk b/platform/msm8996/rules.mk
index 8db37d5..66d6af7 100644
--- a/platform/msm8996/rules.mk
+++ b/platform/msm8996/rules.mk
@@ -4,7 +4,7 @@
 ARM_CPU := cortex-a8
 CPU     := generic
 
-DEFINES += ARM_CPU_CORE_KRAIT
+DEFINES += ARM_CPU_CORE_KRYO
 
 MMC_SLOT         := 1