commit d2b449903821a8665db9a42e69eb12e88b29d49b
author Linux Build Service Account <lnxbuild@qualcomm.com> Fri Oct 22 10:45:20 2010 -0700
committer QuIC Gerrit Code Review <code-review@quicinc.com> Fri Oct 22 10:45:20 2010 -0700
tree 7d258a67343690b2eb61e32bd95361d0134ed3e8
parent b0d44785d7adfd92151e541ea56f6021edd21713
parent 4dfe44a2d63aaeb12f83cfe2bbf81e9c75039d4d

Merge "[msm_shared/mmc]: Add ST1,ST2,EFS2 partitions to partition table."

platform/msm7x30/arch_init.S

diff --git a/platform/msm7x30/arch_init.S b/platform/msm7x30/arch_init.S
index e0a0053..8093152 100644
--- a/platform/msm7x30/arch_init.S
+++ b/platform/msm7x30/arch_init.S
@@ -194,8 +194,8 @@
         // (Raptor V2 and earlier, or Halcyon V1)
         MRC    p15, 0, r1, c0, c0, 0      //; MIDR
         BIC    r2, r1, #0xf0              //; check for Halcyon V1
-        LDR    r3, =0x511f0000
-        CMP    r2, r3
+        LDR    r4, =0x511f0000
+        CMP    r2, r4
         BNE    PVR2F1
 
 DPRC:

project/msm8660_csfb.mk

diff --git a/project/msm8660_csfb.mk b/project/msm8660_csfb.mk
new file mode 100644
index 0000000..482a048
--- /dev/null
+++ b/project/msm8660_csfb.mk
@@ -0,0 +1,11 @@
+# top level project rules for the msm8660_csfb project
+#
+LOCAL_DIR := $(GET_LOCAL_DIR)
+
+TARGET := msm8660_surf
+
+MODULES += app/aboot
+
+#DEFINES += WITH_DEBUG_DCC=1
+#DEFINES += WITH_DEBUG_UART=1
+#DEFINES += WITH_DEBUG_FBCON=1