Merge change I5dcc8279
* changes:
[platform/msm7x30]: Fix the Debug timer clock divider value according to hardware version.
diff --git a/AndroidBoot.mk b/AndroidBoot.mk
index 4487d0c..dabd93c 100644
--- a/AndroidBoot.mk
+++ b/AndroidBoot.mk
@@ -1,6 +1,6 @@
#Android makefile to build lk bootloader as a part of Android Build
-TARGET_BOOTLOADER := out/target/product/$(TARGET_PRODUCT)/appsboot.mbn
+TARGET_BOOTLOADER := $(PRODUCT_OUT)/appsboot.mbn
BOOTLOADER_OUT := $(TOP)/$(TARGET_OUT_INTERMEDIATES)/BOOTLOADER_OBJ
# Remove bootloader binary to trigger recompile when source changes
@@ -13,7 +13,7 @@
ifeq ($(TARGET_USERIMAGES_USE_EXT2),true)
-TARGET_BOOTLOADER_EMMC := out/target/product/$(TARGET_PRODUCT)/emmc_appsboot.mbn
+TARGET_BOOTLOADER_EMMC := $(PRODUCT_OUT)/emmc_appsboot.mbn
BOOTLOADER_EMMC_OUT := $(TOP)/$(TARGET_OUT_INTERMEDIATES)/BOOTLOADER_EMMC_OBJ
emmc_appsbootldr_clean:
diff --git a/app/aboot/aboot.c b/app/aboot/aboot.c
index 0060306..3c894dc 100755
--- a/app/aboot/aboot.c
+++ b/app/aboot/aboot.c
@@ -389,6 +389,8 @@
boot_into_recovery = 1;
if (keys_get_state(KEY_BACK) != 0)
goto fastboot;
+ if (keys_get_state(KEY_CLEAR) != 0)
+ goto fastboot;
reboot_mode = check_reboot_mode();
if (reboot_mode == RECOVERY_MODE){
diff --git a/target/msm7630_surf/init.c b/target/msm7630_surf/init.c
index 2ea8294..7f82e09 100644
--- a/target/msm7630_surf/init.c
+++ b/target/msm7630_surf/init.c
@@ -64,22 +64,22 @@
static struct ptentry board_part_list[] = {
{
.start = 0,
- .length = 40,
+ .length = 20 /* 5MB */,
.name = "boot",
},
{
- .start = 56,
- .length = 312 /* 76MB */,
+ .start = 20,
+ .length = 320 /* 80MB */,
.name = "system",
},
{
- .start = 372,
- .length = 304 /* 76MB */,
+ .start = 340,
+ .length = 20 /* 5MB */,
.name = "cache",
},
{
- .start = 680,
- .length = 304 /* 76MB */,
+ .start = 360,
+ .length = 400 /* 100MB */,
.name = "userdata",
},
};
diff --git a/target/msm7630_surf/keypad.c b/target/msm7630_surf/keypad.c
index 4fa6913..516eab6 100644
--- a/target/msm7630_surf/keypad.c
+++ b/target/msm7630_surf/keypad.c
@@ -45,6 +45,7 @@
static unsigned int qwerty_keymap[] = {
[KEYMAP_INDEX(4, 2)] = KEY_BACK, /* -L on SURF & FFA */
+ [KEYMAP_INDEX(1, 4)] = KEY_CLEAR, /* '-' of left side switch on FLUID */
};
static struct qwerty_keypad_info qwerty_keypad = {