Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fd5a89d authored by Koushik Dutta's avatar Koushik Dutta Committed by Ricardo Cerqueira
Browse files

Add initial support for charge mode. also support recovery/root in the device... 

Add initial support for charge mode. also support recovery/root in the device tree to easily copy props into recovery images.

Change-Id: Icf773a49f2802e3b287b970a390339f1ba0c7aad
parent 0b324e74

core/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -631,8 +631,9 @@ recovery_build_prop := $(INSTALLED_BUILD_PROP_TARGET) 
recovery_binary := $(call intermediates-dir-for,EXECUTABLES,recovery)/recovery

recovery_resources_common := $(call include-path-for, recovery)/res

recovery_resources_private := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery/res))

recovery_root_private := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery/root))

recovery_resource_deps := $(shell find $(recovery_resources_common) \

  $(recovery_resources_private) -type f)

  $(recovery_resources_private) $(recovery_root_private) -type f)

recovery_fstab := $(strip $(wildcard $(TARGET_DEVICE_DIR)/recovery.fstab))

# Named '.dat' so we don't attempt to use imgdiff for patching it.

RECOVERY_RESOURCE_ZIP := $(TARGET_OUT)/etc/recovery-resource.dat
@@ -714,6 +715,8 @@ $(TARGET_RECOVERY_ROOT_TIMESTAMP): $(INTERNAL_RECOVERY_FILES) \ 
	$(hide) cp -rf $(recovery_resources_common) $(TARGET_RECOVERY_ROOT_OUT)/

	$(hide) $(foreach item,$(recovery_resources_private), \

	  cp -rf $(item) $(TARGET_RECOVERY_ROOT_OUT)/)

	$(foreach item,$(recovery_root_private), \

	  cp -rf $(item) $(TARGET_RECOVERY_OUT)/)

	$(hide) $(foreach item,$(recovery_fstab), \

	  cp -f $(item) $(TARGET_RECOVERY_ROOT_OUT)/etc/recovery.fstab)

	$(hide) cp $(RECOVERY_INSTALL_OTA_KEYS) $(TARGET_RECOVERY_ROOT_OUT)/res/keys

tools/device/BoardConfig.mk.template

+3 −3
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ BOARD_KERNEL_BASE := 0x__BASE__ 
BOARD_KERNEL_PAGESIZE := __PAGE_SIZE__



# fix this up by examining /proc/mtd on a running device

BOARD_BOOTIMAGE_PARTITION_SIZE := 0x00380000

BOARD_RECOVERYIMAGE_PARTITION_SIZE := 0x00480000

BOARD_SYSTEMIMAGE_PARTITION_SIZE := 0x08c60000

BOARD_BOOTIMAGE_PARTITION_SIZE := 0x105c0000

BOARD_RECOVERYIMAGE_PARTITION_SIZE := 0x105c0000

BOARD_SYSTEMIMAGE_PARTITION_SIZE := 0x105c0000

BOARD_USERDATAIMAGE_PARTITION_SIZE := 0x105c0000

BOARD_FLASH_BLOCK_SIZE := 131072

tools/device/device.mk.template

+2 −2
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ $(call inherit-product-if-exists, vendor/__MANUFACTURER__/__DEVICE__/__DEVICE__- 


DEVICE_PACKAGE_OVERLAYS += device/__MANUFACTURER__/__DEVICE__/overlay





LOCAL_PATH := device/__MANUFACTURER__/__DEVICE__

ifeq ($(TARGET_PREBUILT_KERNEL),)

	LOCAL_KERNEL := device/__MANUFACTURER__/__DEVICE__/kernel

	LOCAL_KERNEL := $(LOCAL_PATH)/kernel

else

	LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL)

endif

tools/device/mkvendor.sh

+13 −0
Original line number Diff line number Diff line
@@ -94,6 +94,19 @@ then 
    then

        cp $RECOVERY_FSTAB $DEVICE_DIR/recovery.fstab

    fi

    if [ -f "$TMPDIR/ramdisk/sbin/htcbatt" ]

    then

        mkdir -p $DEVICE_DIR/recovery/root/sbin

        CHARGER_FILES="/sbin/choice_fn /sbin/htcbatt /sbin/power_test /sbin/offmode_charging /sbin/detect_key"

        for f in $CHARGER_FILES

        do

            if [ -f "$TMPDIR/ramdisk/$f" ]

            then

                cp $TMPDIR/ramdisk/$f $DEVICE_DIR/recovery/root/sbin

            fi

        done

        cp $TEMPLATE_DIR/init.htc.rc $DEVICE_DIR/recovery/root

    fi

fi