Skip to content

Commit 526bb5e

Browse files
committed
vigor: add TWRP configuration
*Fixes recovery not charging on all recoveries including CWM
1 parent 78ee2ed commit 526bb5e

6 files changed

Lines changed: 46 additions & 2 deletions

File tree

BoardConfig.mk

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,3 +91,13 @@ TARGET_RECOVERY_FSTAB := device/htc/vigor/rootdir/etc/fstab.vigor
9191
BOARD_HAS_NO_SELECT_BUTTON := true
9292
BOARD_USE_CUSTOM_RECOVERY_FONT := \"roboto_15x24.h\"
9393
COMMON_GLOBAL_CFLAGS += -DRECOVERY_CANT_USE_CONFIG_EXT4_FS_XATTR
94+
95+
#TWRP
96+
DEVICE_RESOLUTION := 720x1280
97+
TW_FLASH_FROM_STORAGE := true
98+
RECOVERY_GRAPHICS_USE_LINELENGTH := true
99+
TW_INCLUDE_DUMLOCK := true
100+
TW_INCLUDE_JB_CRYPTO := true
101+
TW_NO_SCREEN_BLANK := true
102+
TW_BRIGHTNESS_PATH := "/sys/class/leds/lcd-backlight/brightness"
103+
TW_HTC_LED := true

recovery/Android.mk

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,14 @@ LOCAL_SRC_FILES := etc/init.recovery.vigor.rc
88
LOCAL_MODULE_PATH := $(TARGET_ROOT_OUT)
99
include $(BUILD_PREBUILT)
1010

11+
include $(CLEAR_VARS)
12+
LOCAL_MODULE := twrp.fstab
13+
LOCAL_MODULE_TAGS := optional eng
14+
LOCAL_MODULE_CLASS := ETC
15+
LOCAL_SRC_FILES := etc/twrp.fstab
16+
LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/etc
17+
include $(BUILD_PREBUILT)
18+
1119
include $(CLEAR_VARS)
1220
LOCAL_MODULE := choice_fn
1321
LOCAL_MODULE_TAGS := optional eng
@@ -24,6 +32,14 @@ LOCAL_SRC_FILES := sbin/detect_key
2432
LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
2533
include $(BUILD_PREBUILT)
2634

35+
include $(CLEAR_VARS)
36+
LOCAL_MODULE := htcbatt
37+
LOCAL_MODULE_TAGS := optional eng
38+
LOCAL_MODULE_CLASS := ETC
39+
LOCAL_SRC_FILES := sbin/htcbatt
40+
LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
41+
include $(BUILD_PREBUILT)
42+
2743
include $(CLEAR_VARS)
2844
LOCAL_MODULE := offmode_charging
2945
LOCAL_MODULE_TAGS := optional eng
@@ -38,4 +54,4 @@ LOCAL_MODULE_TAGS := optional eng
3854
LOCAL_MODULE_CLASS := ETC
3955
LOCAL_SRC_FILES := sbin/power_test
4056
LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin
41-
include $(BUILD_PREBUILT)
57+
include $(BUILD_PREBUILT)

recovery/etc/init.recovery.vigor.rc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,11 @@ service detect_key /sbin/detect_key
99

1010
service offmode_charging /sbin/offmode_charging
1111
disabled
12+
oneshot
1213

1314
service power_test /sbin/power_test
1415
disabled
15-
oneshot
16+
oneshot
17+
18+
service htcbatt /sbin/htcbatt
19+
oneshot

recovery/etc/twrp.fstab

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# mount point fstype device [device2] [parameters]
2+
3+
/boot emmc /dev/block/mmcblk0p22
4+
/cache ext4 /dev/block/mmcblk0p36
5+
/data ext4 /dev/block/mmcblk0p35 length=-16384
6+
/misc emmc /dev/block/mmcblk0p24
7+
/recovery emmc /dev/block/mmcblk0p23
8+
/system ext4 /dev/block/mmcblk0p29
9+
/devlog ext4 /dev/block/mmcblk0p30
10+
/sdcard vfat /dev/block/mmcblk0p38 flags=display="Internal SDcard";storage;wipeingui
11+
/external_sd vfat /dev/block/mmcblk1p1 /dev/block/mmcblk1 flags=display="Micro SDcard";storage;wipeingui;removable
12+
/usb-otg vfat /dev/block/sda1 /dev/block/sda flags=display="USB OTG";storage;wipeingui;removable

recovery/sbin/htcbatt

70.5 KB
Binary file not shown.

vigor.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ PRODUCT_COPY_FILES := device/htc/vigor/gps/gps.conf:system/etc/gps.conf
2727
# Recovery
2828
PRODUCT_PACKAGES += \
2929
init.recovery.vigor.rc \
30+
twrp.fstab \
3031
choice_fn \
3132
detect_key \
33+
htcbatt \
3234
offmode_charging \
3335
power_test
3436

0 commit comments

Comments
 (0)