diff --git a/BoardConfig.mk b/BoardConfig.mk index 971f9a4..b004dd3 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -43,7 +43,8 @@ TARGET_NO_BOOTLOADER := true # Kernel BOARD_KERNEL_BASE := 0x80000000 -BOARD_KERNEL_CMDLINE := console=null androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7464900.sdhci lpm_levels.sleep_disabled=1 rcupdate.rcu_expedited=1 cma=32M@0-0xffffffff androidboot.selinux=permissive +#BOARD_KERNEL_CMDLINE := console=null androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7464900.sdhci lpm_levels.sleep_disabled=1 rcupdate.rcu_expedited=1 cma=32M@0-0xffffffff androidboot.selinux=permissive +BOARD_KERNEL_CMDLINE := console=null androidboot.hardware=qcom msm_rtb.filter=0x237 ehci-hcd.park=3 androidboot.bootdevice=7464900.sdhci lpm_levels.sleep_disabled=1 rcupdate.rcu_expedited=1 cma=32M@0-0xffffffff BOARD_KERNEL_IMAGE_NAME := Image.gz BOARD_KERNEL_PAGESIZE := 4096 BOARD_KERNEL_SEPARATED_DT := true @@ -173,7 +174,7 @@ BOARD_HARDWARE_CLASS += \ $(DEVICE_PATH)/lineagehw # Power -TARGET_HAS_NO_WIFI_STATS := true +#TARGET_HAS_NO_WIFI_STATS := true TARGET_POWERHAL_VARIANT := qcom # QCOM @@ -207,15 +208,17 @@ BOARD_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy BOARD_HAS_QCOM_WLAN := true BOARD_HAS_QCOM_WLAN_SDK := true BOARD_WLAN_DEVICE := qcwcn -BOARD_HOSTAPD_DRIVER := NL80211 -BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) BOARD_WPA_SUPPLICANT_DRIVER := NL80211 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) -WPA_SUPPLICANT_VERSION := VER_0_8_X +BOARD_HOSTAPD_DRIVER := NL80211 +BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_$(BOARD_WLAN_DEVICE) +HOSTAPD_VERSION := VER_0_8_X WIFI_DRIVER_FW_PATH_AP := "ap" WIFI_DRIVER_FW_PATH_STA := "sta" WIFI_DRIVER_FW_PATH_P2P := "p2p" -WPA_SUPPLICANT_USE_HIDL := true +WPA_SUPPLICANT_VERSION := VER_0_8_X + +BOARD_HAVE_SAMSUNG_WIFI := true # inherit from the proprietary version -include vendor/samsung/gts3llte/BoardConfigVendor.mk \ No newline at end of file diff --git a/device.mk b/device.mk index 6214080..9b9e0c9 100644 --- a/device.mk +++ b/device.mk @@ -270,19 +270,28 @@ PRODUCT_PACKAGES += \ # OMX PRODUCT_PACKAGES += \ libc2dcolorconvert \ + libdashplayer \ + libdivxdrmdecrypt \ + libhypv_intercept \ + libmm-omxcore \ libextmedia_jni \ libOmxAacEnc \ libOmxAmrEnc \ libOmxCore \ libOmxEvrcEnc \ libOmxQcelp13Enc \ + libOmxSwVencMpeg4 \ + libOmxSwVencHevc \ libOmxVdec \ + libOmxVdecHevc \ libOmxVenc \ - libstagefrighthw + libOmxVidcCommon \ + libstagefrighthw \ + libstagefright_soft_flacdec # Power PRODUCT_PACKAGES += \ - android.hardware.power@1.0-service-qti + android.hardware.power@1.1-service-qti PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/powerhint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/powerhint.xml @@ -359,13 +368,10 @@ PRODUCT_PACKAGES += \ vndk-sp # WCNSS -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/wifi/WCNSS_cfg.dat:$(TARGET_COPY_OUT_VENDOR)/etc/firmware/wlan/qca_cld/WCNSS_cfg.dat \ - $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:$(TARGET_COPY_OUT_VENDOR)/etc/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini - PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/wifi/WCNSS_cfg.dat:system/etc/firmware/wlan/qca_cld/WCNSS_cfg.dat \ - $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:system/etc/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini + $(LOCAL_PATH)/wifi/WCNSS_qcom_cfg.ini:system/etc/firmware/wlan/qca_cld/WCNSS_qcom_cfg.ini \ + $(LOCAL_PATH)/wifi/grippower.info:system/etc/firmware/wlan/qca_cld/grippower.info # Wifi PRODUCT_PACKAGES += \ @@ -377,6 +383,10 @@ PRODUCT_PACKAGES += \ wpa_supplicant \ wpa_supplicant.conf +# trick for "cat /proc/deferred_initcalls" in enforce +PRODUCT_PACKAGES += \ + wifiloader + PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/wifi/p2p_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/p2p_supplicant_overlay.conf \ $(LOCAL_PATH)/wifi/wpa_supplicant_overlay.conf:$(TARGET_COPY_OUT_VENDOR)/etc/wifi/wpa_supplicant_overlay.conf diff --git a/rootdir/etc/init.qcom.power.rc b/rootdir/etc/init.qcom.power.rc index 03cbbd2..96281b4 100644 --- a/rootdir/etc/init.qcom.power.rc +++ b/rootdir/etc/init.qcom.power.rc @@ -180,10 +180,10 @@ on property:sys.boot_completed=1 on property:init.svc.recovery=running trigger enable-low-power -#service charger /charger -# class charger -# group system graphics -# seclabel u:r:healthd:s0 +service charger /charger + class charger + group system graphics + seclabel u:r:healthd:s0 service energy-awareness /vendor/bin/energy-awareness class main diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc index bd715e8..a159620 100644 --- a/rootdir/etc/init.target.rc +++ b/rootdir/etc/init.target.rc @@ -500,9 +500,9 @@ on charger mount ext4 /dev/block/bootdevice/by-name/system /system ro barrier=1 # LPM (samsung charger) -service lpm /system/bin/lpm - class charger - critical +#service lpm /system/bin/lpm +# class charger +# critical service dhcpcd_eth0 /system/vendor/bin/dhcpcd -ABKLG class late_start @@ -521,7 +521,11 @@ service ppd /vendor/bin/mm-pp-dpps socket pps stream 0660 system system disabled -service sec-sh /system/bin/sh /system/etc/init.sec.boot.sh +#service sec-sh /system/bin/sh /system/etc/init.sec.boot.sh +# class main +# user root +# oneshot + +service wifiloader /system/bin/wifiloader class main - user root oneshot diff --git a/system.prop b/system.prop index 4399a33..d4d0a67 100644 --- a/system.prop +++ b/system.prop @@ -150,3 +150,6 @@ persist.data.df.dev_name=rmnet_usb0 # Adreno ro.qcom.adreno.qgl.ShaderStorageImageExtendedFormats=0 + +# Wifi +wifi.interface=wlan0 diff --git a/wifi/grippower.info b/wifi/grippower.info new file mode 100644 index 0000000..ac2182d --- /dev/null +++ b/wifi/grippower.info @@ -0,0 +1 @@ +55:55 \ No newline at end of file diff --git a/wifi/p2p_supplicant_overlay.conf b/wifi/p2p_supplicant_overlay.conf index acbace2..4e53977 100644 --- a/wifi/p2p_supplicant_overlay.conf +++ b/wifi/p2p_supplicant_overlay.conf @@ -1 +1,3 @@ disable_scan_offload=1 +p2p_no_group_iface=1 +p2p_search_delay=100 diff --git a/wifi/wpa_supplicant_overlay.conf b/wifi/wpa_supplicant_overlay.conf index 58c2639..e1f530d 100644 --- a/wifi/wpa_supplicant_overlay.conf +++ b/wifi/wpa_supplicant_overlay.conf @@ -1,2 +1,3 @@ disable_scan_offload=1 p2p_disabled=1 +tdls_external_control=1