Merge "build: Allow target override from TARGET_PRODUCT"
diff --git a/platform/msm8x60/platform.c b/platform/msm8x60/platform.c
index 478aec9..12e455d 100755
--- a/platform/msm8x60/platform.c
+++ b/platform/msm8x60/platform.c
@@ -52,7 +52,7 @@
#define MB (1024*1024)
/* LK memory - cacheable, write through */
-#define LK_MEMORY (MMU_MEMORY_TYPE_NORMAL_WRITE_THROUGH | \
+#define LK_MEMORY (MMU_MEMORY_TYPE_STRONGLY_ORDERED | \
MMU_MEMORY_AP_READ_WRITE)
/* Kernel region - cacheable, write through */
diff --git a/platform/msm_shared/smem.h b/platform/msm_shared/smem.h
index 719efe2..f36efe8 100644
--- a/platform/msm_shared/smem.h
+++ b/platform/msm_shared/smem.h
@@ -225,6 +225,9 @@
ESM7225AB = 133,
MSM7125A = 135,
MSM7127A = 136,
+ MSM8930AA = 142,
+ MSM8630AA = 143,
+ MSM8230AA = 144,
};
enum platform {
diff --git a/target/msm8960/init.c b/target/msm8960/init.c
index 6d48793..7043816 100644
--- a/target/msm8960/init.c
+++ b/target/msm8960/init.c
@@ -110,7 +110,12 @@
{
msm8960_keypad_init();
}
- else if(platform_id == MSM8930)
+ else if((platform_id == MSM8230) ||
+ (platform_id == MSM8630) ||
+ (platform_id == MSM8930) ||
+ (platform_id == MSM8230AA) ||
+ (platform_id == MSM8630AA) ||
+ (platform_id == MSM8930AA))
{
msm8930_keypad_init();
}
@@ -320,8 +325,10 @@
default:
target_id = LINUX_MACHTYPE_8960_CDP;
}
- } else if ((platform == MSM8230) || (platform == MSM8630)
- || (platform == MSM8930) || (platform == APQ8030)) {
+ } else if ((platform == MSM8230) || (platform == MSM8630) ||
+ (platform == MSM8930) || (platform == MSM8230AA) ||
+ (platform == MSM8630AA) || (platform == MSM8930AA) ||
+ (platform == APQ8030)) {
switch (platform_hw) {
case HW_PLATFORM_SURF:
target_id = LINUX_MACHTYPE_8930_CDP;