From a012ae4fa4929d6766526799ee8ab23854f92bd0 Mon Sep 17 00:00:00 2001 From: Dheeraj CVR Date: Wed, 24 Dec 2014 13:01:48 +0530 Subject: smdk4412-common: switch to opensource healthd-charger Conflicts: common.mk proprietary-files.txt rootdir/init.smdk4x12.rc Change-Id: I32aeb89f0c4acb0ba50f1f03a87d5e55386a05ca --- BoardCommonConfig.mk | 9 ++++----- common.mk | 7 ++++++- proprietary-files.txt | 28 ---------------------------- rootdir/init.smdk4x12.rc | 34 ++++++---------------------------- 4 files changed, 16 insertions(+), 62 deletions(-) diff --git a/BoardCommonConfig.mk b/BoardCommonConfig.mk index b0eaf84..d91e77e 100755 --- a/BoardCommonConfig.mk +++ b/BoardCommonConfig.mk @@ -159,15 +159,14 @@ BOARD_HAS_NO_SELECT_BUTTON := true # Charging mode BOARD_CHARGING_MODE_BOOTING_LPM := /sys/class/power_supply/battery/batt_lp_charging BOARD_BATTERY_DEVICE_NAME := "battery" - -# Override healthd HAL -BOARD_HAL_STATIC_LIBRARIES := libhealthd.exynos4 - -# Healthd Charger +BOARD_CHARGER_ENABLE_SUSPEND := true RED_LED_PATH := /sys/class/leds/led_r/brightness GREEN_LED_PATH := /sys/class/leds/led_g/brightness BLUE_LED_PATH := /sys/class/leds/led_b/brightness BACKLIGHT_PATH := /sys/class/backlight/panel/brightness +# Override healthd HAL +BOARD_HAL_STATIC_LIBRARIES := libhealthd.exynos4 + # inherit from the proprietary version -include vendor/samsung/smdk4412-common/BoardConfigVendor.mk diff --git a/common.mk b/common.mk index 1c50530..0b2fef0 100644 --- a/common.mk +++ b/common.mk @@ -125,7 +125,8 @@ PRODUCT_PACKAGES += \ VisualizationWallpapers \ librs_jni -#wifi + +# Wifi PRODUCT_PACKAGES += \ libwpa_client \ hostapd \ @@ -133,6 +134,10 @@ PRODUCT_PACKAGES += \ wpa_supplicant \ wpa_supplicant.conf +# Charger +PRODUCT_PACKAGES += \ + charger_res_images + # These are the hardware-specific features PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.audio.low_latency.xml:system/etc/permissions/android.hardware.audio.low_latency.xml \ diff --git a/proprietary-files.txt b/proprietary-files.txt index bb2e401..5da466e 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -4,7 +4,6 @@ system/bin/bcm4334_murata.hcd system/bin/bcm4334_semco.hcd system/bin/bcm4334_semcosh.hcd system/bin/gps.cer -system/bin/lpm system/cameradata/datapattern_420sp.yuv system/cameradata/datapattern_front_420sp.yuv system/etc/srm.bin @@ -33,35 +32,8 @@ system/lib/libMali.so system/lib/libMcClient.so system/lib/libMcRegistry.so system/lib/libMcVersion.so -system/lib/libQmageDecoder.so -system/lib/libquramimagecodec.so system/lib/libsecnativefeature.so system/lib/libUMP.so -system/lib/libvdis.so -system/media/battery_batteryerror.qmg -system/media/battery_charging_100.qmg -system/media/battery_charging_10.qmg -system/media/battery_charging_15.qmg -system/media/battery_charging_20.qmg -system/media/battery_charging_25.qmg -system/media/battery_charging_30.qmg -system/media/battery_charging_35.qmg -system/media/battery_charging_40.qmg -system/media/battery_charging_45.qmg -system/media/battery_charging_50.qmg -system/media/battery_charging_55.qmg -system/media/battery_charging_5.qmg -system/media/battery_charging_60.qmg -system/media/battery_charging_65.qmg -system/media/battery_charging_70.qmg -system/media/battery_charging_75.qmg -system/media/battery_charging_80.qmg -system/media/battery_charging_85.qmg -system/media/battery_charging_90.qmg -system/media/battery_charging_95.qmg -system/media/battery_error.qmg -system/media/chargingwarning.qmg -system/media/Disconnected.qmg system/usr/idc/melfas_ts.idc system/usr/idc/sec_touchscreen.idc system/usr/keylayout/gpio-keys.kl diff --git a/rootdir/init.smdk4x12.rc b/rootdir/init.smdk4x12.rc index 16bc954..c45b557 100755 --- a/rootdir/init.smdk4x12.rc +++ b/rootdir/init.smdk4x12.rc @@ -43,40 +43,12 @@ on fs chmod 0771 /efs on charger - mount ext4 /dev/block/platform/dw_mmc/by-name/SYSTEM /system ro wait noatime - mount ext4 /dev/block/platform/dw_mmc/by-name/USERDATA /data rw wait noatime nosuid nodev discard noauto_da_alloc journal_async_commit - mkdir /data/log 0777 - - chmod 0666 /dev/log/radio - chmod 0666 /dev/log/main - chmod 0666 /dev/log/event - # CPU Frequency Governor write /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor powersave # EHCI runtime enable for LPA write /sys/devices/platform/s5p-ehci/power/control auto - ifup lo - hostname localhost - domainname localdomain - - class_start default - -service debuggerd /system/bin/debuggerd - -service ueventd /sbin/ueventd - critical - -service console /system/bin/sh - console - -service healthd-charger /sbin/healthd -n - critical - -service lpm /system/bin/lpm - critical - on post-fs-data # we will remap this as /mnt/sdcard with the sdcard fuse tool mkdir /data/media 0775 media_rw media_rw @@ -277,6 +249,7 @@ on post-fs-data chown system radio /sys/class/power_supply/battery/batt_vfocv chown system radio /sys/class/power_supply/battery/batt_lp_charging chown system radio /sys/class/power_supply/battery/batt_charging_source + chown system radio /sys/class/power_supply/battery/charging_enabled chown system radio /sys/class/power_supply/battery/test_mode chown system radio /sys/class/power_supply/battery/wc_status chown system radio /sys/class/power_supply/battery/wpc_pin_state @@ -485,6 +458,11 @@ service fuse_usbdisk0 /system/bin/sdcard -u 1023 -g 1023 /mnt/media_rw/usbdisk0 class late_start disabled +service charger /sbin/healthd -c + class charger + critical + seclabel u:r:healthd:s0 + service p2p_supplicant /system/bin/wpa_supplicant \ -iwlan0 -Dnl80211 -c/data/misc/wifi/wpa_supplicant.conf \ -I/system/etc/wifi/wpa_supplicant.conf \ -- cgit v1.1