Skip to content

Commit 118a6c8

Browse files
committed
Updated CWM Recovery config
1 parent 23cfd51 commit 118a6c8

File tree

7 files changed

+131
-24
lines changed

7 files changed

+131
-24
lines changed

BoardConfig.mk

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,29 @@ USE_CAMERA_STUB := true
55

66
TARGET_ARCH := arm
77
TARGET_NO_BOOTLOADER := true
8-
TARGET_BOARD_PLATFORM := unknown
8+
TARGET_BOARD_PLATFORM := mt6589
99
TARGET_CPU_ABI := armeabi-v7a
1010
TARGET_CPU_ABI2 := armeabi
1111
TARGET_ARCH_VARIANT := armv7-a-neon
1212
ARCH_ARM_HAVE_TLS_REGISTER := true
1313

14-
TARGET_BOOTLOADER_BOARD_NAME := w8
15-
14+
TARGET_PREBUILT_KERNEL := device/thl/w8/kernel
1615
BOARD_KERNEL_CMDLINE :=
1716
BOARD_KERNEL_BASE := 0x10000000
1817
BOARD_KERNEL_PAGESIZE := 2048
1918

20-
# fix this up by examining /proc/mtd on a running device
21-
BOARD_BOOTIMAGE_PARTITION_SIZE := 0x105c0000
22-
BOARD_RECOVERYIMAGE_PARTITION_SIZE := 0x105c0000
23-
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 0x105c0000
24-
BOARD_USERDATAIMAGE_PARTITION_SIZE := 0x105c0000
25-
BOARD_FLASH_BLOCK_SIZE := 131072
26-
27-
TARGET_PREBUILT_KERNEL := device/thl/w8/kernel
19+
TARGET_BOOTLOADER_BOARD_NAME := w8
2820

2921
BOARD_HAS_NO_SELECT_BUTTON := true
22+
23+
# Recovery
24+
TARGET_RECOVERY_FSTAB := device/thl/w8/recovery/recovery.fstab
25+
TARGET_RECOVERY_INITRC := device/thl/w8/recovery/recovery.rc
26+
BOARD_CUSTOM_RECOVERY_KEYMAPPING := ../../device/thl/w8/recovery/recovery_keys.c
27+
28+
# Partition sizes
29+
BOARD_BOOTIMAGE_PARTITION_SIZE := 0x00600000
30+
BOARD_RECOVERYIMAGE_PARTITION_SIZE := 0x00600000
31+
BOARD_SYSTEMIMAGE_PARTITION_SIZE := 0x28A00000
32+
BOARD_USERDATAIMAGE_PARTITION_SIZE := 0x40000000
33+
BOARD_FLASH_BLOCK_SIZE := 131072

cm.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ $(call inherit-product, device/thl/w8/device_w8.mk)
1313
## Device identifier. This must come after all inclusions
1414
PRODUCT_DEVICE := w8
1515
PRODUCT_NAME := cm_w8
16-
PRODUCT_BRAND := thl
16+
PRODUCT_BRAND := THL
1717
PRODUCT_MODEL := w8
18-
PRODUCT_MANUFACTURER := thl
18+
PRODUCT_MANUFACTURER := THL

kernel

17 KB
Binary file not shown.

recovery.fstab

Lines changed: 0 additions & 11 deletions
This file was deleted.

recovery/recovery.fstab

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# mount point fstype device [device2]
2+
/system ext4 /dev/block/mmcblk0p5
3+
/cache ext4 /dev/block/mmcblk0p6
4+
/data ext4 /dev/block/mmcblk0p7
5+
/storage vfat /dev/block/mmcblk0p8
6+
/sdcard vfat /dev/block/mmcblk1 /dev/block/mmcblk1p1
7+
/sd-ext auto /dev/block/mmcblk1p2

recovery/recovery.rc

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
on early-init
2+
start ueventd
3+
4+
on init
5+
export PATH /sbin
6+
export ANDROID_ROOT /system
7+
export ANDROID_DATA /data
8+
export EXTERNAL_STORAGE /sdcard
9+
10+
symlink /system/etc /etc
11+
12+
mkdir /boot
13+
mkdir /storage
14+
mkdir /sdcard
15+
mkdir /sd-ext
16+
mkdir /datadata
17+
mkdir /emmc
18+
mkdir /system
19+
mkdir /data
20+
mkdir /cache
21+
mount /tmp /tmp tmpfs
22+
23+
chown root shell /tmp
24+
chmod 0775 /tmp
25+
26+
on boot
27+
28+
ifup lo
29+
hostname localhost
30+
domainname localdomain
31+
32+
class_start default
33+
34+
service ueventd /sbin/ueventd
35+
critical
36+
37+
service recovery /sbin/recovery
38+
oneshot
39+
40+
service adbd /sbin/adbd recovery
41+
disabled
42+
43+
on property:ro.debuggable=1
44+
write /sys/class/android_usb/android0/enable 0
45+
write /sys/class/android_usb/android0/iSerial CWM-THLW8
46+
write /sys/class/android_usb/android0/iManufacturer ${ro.product.manufacturer}
47+
write /sys/class/android_usb/android0/iProduct ${ro.product.model}
48+
write /sys/class/android_usb/android0/idVendor 0bb4
49+
write /sys/class/android_usb/android0/idProduct 0c03
50+
write /sys/class/android_usb/android0/functions mass_storage,adb
51+
write /sys/class/android_usb/android0/enable 1
52+
start adbd
53+
setprop service.adb.root 1
54+
55+
# Restart adbd so it can run as root
56+
on property:service.adb.root=1
57+
write /sys/class/android_usb/android0/enable 0
58+
restart adbd
59+
write /sys/class/android_usb/android0/enable 1

recovery/recovery_keys.c

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#include <linux/input.h>
2+
3+
#include "recovery_ui.h"
4+
#include "common.h"
5+
#include "extendedcommands.h"
6+
7+
8+
int device_toggle_display(volatile char* key_pressed, int key_code) {
9+
int alt = key_pressed[KEY_LEFTALT] || key_pressed[KEY_RIGHTALT];
10+
if (alt && key_code == KEY_L)
11+
return 1;
12+
// allow toggling of the display if the correct key is pressed, and the display toggle is allowed or the display is currently off
13+
if (ui_get_showing_back_button()) {
14+
return 0;
15+
//return get_allow_toggle_display() && (key_code == KEY_HOME || key_code == KEY_MENU || key_code == KEY_END);
16+
}
17+
return get_allow_toggle_display() && (key_code == KEY_HOME || key_code == KEY_MENU || key_code == KEY_POWER || key_code == KEY_END);
18+
}
19+
20+
int device_handle_key(int key_code, int visible) {
21+
if (visible) {
22+
switch (key_code) {
23+
case KEY_VOLUMEDOWN:
24+
return HIGHLIGHT_DOWN;
25+
26+
case KEY_VOLUMEUP:
27+
return HIGHLIGHT_UP;
28+
29+
case KEY_POWER:
30+
if (ui_get_showing_back_button()) {
31+
return SELECT_ITEM;
32+
}
33+
if (!get_allow_toggle_display() && !ui_root_menu) {
34+
return GO_BACK;
35+
}
36+
break;
37+
case KEY_HOME:
38+
return SELECT_ITEM;
39+
40+
case KEY_BACK:
41+
if (!ui_root_menu) {
42+
return GO_BACK;
43+
}
44+
}
45+
}
46+
47+
return NO_ACTION;
48+
}

0 commit comments

Comments
 (0)