From d8339b084d0049523eb93b4ee758766dc2e5a710 Mon Sep 17 00:00:00 2001 From: Ziyan Date: Thu, 5 May 2016 15:07:31 +0200 Subject: espresso: cleanup for our new kernel - Update bcmdhd module name - remove unneeded flags from BoardConfig - update init and ueventd Change-Id: I3ccba088a400f51393bface0d5f99af86e44a081 --- BoardConfigCommon.mk | 8 ++-- rootdir/etc/init.tab2.rc | 101 ++++++-------------------------------------- rootdir/etc/ueventd.tab2.rc | 54 ++++++++++++----------- 3 files changed, 43 insertions(+), 120 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index e7cd5eb..047e050 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -66,17 +66,15 @@ BOARD_WPA_SUPPLICANT_DRIVER := NL80211 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_bcmdhd BOARD_HOSTAPD_DRIVER := NL80211 BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_bcmdhd -WIFI_DRIVER_MODULE_PATH := "/system/lib/modules/dhd.ko" -WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/dhd/parameters/firmware_path" +WIFI_DRIVER_MODULE_PATH := "/system/lib/modules/bcmdhd.ko" +WIFI_DRIVER_FW_PATH_PARAM := "/sys/module/bcmdhd/parameters/firmware_path" WIFI_DRIVER_FW_PATH_STA := "/system/etc/wifi/bcmdhd_sta.bin" WIFI_DRIVER_FW_PATH_AP := "/system/etc/wifi/bcmdhd_apsta.bin" WIFI_DRIVER_FW_PATH_P2P := "/system/etc/wifi/bcmdhd_p2p.bin" -WIFI_DRIVER_MODULE_NAME := "dhd" +WIFI_DRIVER_MODULE_NAME := "bcmdhd" WIFI_DRIVER_MODULE_ARG := "firmware_path=/system/etc/wifi/bcmdhd_sta.bin nvram_path=/system/etc/wifi/nvram_net.txt" WIFI_DRIVER_MODULE_AP_ARG := "firmware_path=/system/etc/wifi/bcmdhd_apsta.bin nvram_path=/system/etc/wifi/nvram_net.txt" WIFI_BAND := 802_11_ABG -BOARD_HAVE_SAMSUNG_WIFI := true -BOARD_NO_APSME_ATTR := true # Bluetooth BOARD_HAVE_BLUETOOTH := true diff --git a/rootdir/etc/init.tab2.rc b/rootdir/etc/init.tab2.rc index d19e0ec..49c5aa8 100644 --- a/rootdir/etc/init.tab2.rc +++ b/rootdir/etc/init.tab2.rc @@ -1,43 +1,25 @@ -import init.${ro.hardware}.usb.rc import init.omap4.rc +import init.espresso.usb.rc on init + # Support legacy paths symlink /sdcard /mnt/sdcard symlink /sdcard /storage/sdcard0 -# KSM + # KSM write /sys/kernel/mm/ksm/pages_to_scan 100 write /sys/kernel/mm/ksm/sleep_millisecs 500 write /sys/kernel/mm/ksm/run 1 -# Vibetonz - export VIBE_PIPE_PATH /dev/pipes - mkdir /dev/pipes 0771 shell shell - -# Vibetonz - chmod 0660 /dev/tspdrv - chown root shell /dev/tspdrv - -# change permissions for ION driver - chmod 0777 /dev/ion - -# PVR - chmod 0666 /dev/pvrsrvkm - on fs - mkdir /efs + mkdir /efs 0775 radio system mount_all /fstab.espresso swapon_all /fstab.espresso -# We chown/chmod /efs because mount is run as root + defaults - chown radio system /efs - chmod 0775 /efs - -# Restorecon restorecon_recursive /efs -# pvr module + # pvr module insmod /system/lib/modules/pvrsrvkm_sgx540_120.ko # read only 1 page at a time @@ -52,38 +34,19 @@ on fs mount debugfs debugfs /sys/kernel/debug on post-fs-data - mkdir /data/misc/wifi 0770 wifi system - mkdir /data/misc/wifi/sockets 0770 wifi wifi - # sensors mkdir /data/sensors 0770 system system -# dmrpc + # dmrpc mkdir /data/smc 0770 drmrpc drmrpc chown drmrpc drmrpc /data/smc/counter.bin chown drmrpc drmrpc /data/smc/storage.bin chown drmrpc drmrpc /data/smc/system.bin -# radio - mkdir /data/misc/dhcp 0775 dhcp dhcp - mkdir /data/misc/radio 0771 radio system + # radio mkdir /data/misc/radio/hatp 0771 radio system - chown radio radio /data/misc/radio - - chown dhcp dhcp /data/misc/dhcp - - write /sys/devices/system/cpu/cpu0/cpufreq/screen_off_max_freq 800000 - chmod 0664 /sys/devices/system/cpu/cpu0/cpufreq/screen_off_max_freq -#DVFS Lock - chown radio system /sys/power/cpufreq_min_limit - chown radio system /sys/power/cpufreq_max_limit - chown radio system /sys/power/cpufreq_table - chmod 0664 /sys/power/cpufreq_min_limit - chmod 0664 /sys/power/cpufreq_max_limit - chmod 0664 /sys/power/cpufreq_table - -# permissions for bluetooth. + # Bluetooth setprop ro.bt.bdaddr_path "/efs/bluetooth/bt_addr" chown bluetooth net_bt_stack ro.bt.bdaddr_path chown bluetooth net_bt_stack /dev/ttyO1 @@ -92,12 +55,8 @@ on post-fs-data chown bluetooth net_bt_stack /sys/class/rfkill/rfkill0/state chown bluetooth net_bt_stack /sys/class/rfkill/rfkill0/type -# for samsung factory. - chown radio radio /efs/bluetooth - chmod 0755 /efs/bluetooth - chmod 0644 /efs/bluetooth/bt_addr + # Change permissions for sensors - # Change permission for sensor chown system input /sys/class/input/input2/enable chown system input /sys/class/input/input2/poll_delay @@ -199,23 +158,11 @@ on post-fs-data chown system radio /sys/class/sensors/light_sensor/vendor chown system radio /sys/class/sensors/light_sensor/name -# Change permission for TSP - chown system radio /sys/class/sec/tsp/cmd - chown system radio /sys/class/sec/tsp/cmd_status - chown system radio /sys/class/sec/tsp/cmd_result - chown media_rw media_rw /sys/class/sec/tsp/set_jitter - -# Change permission for switch - chmod 0660 /sys/class/sec/switch/uart_sel - chmod 0660 /sys/class/sec/switch/usb_sel + # Change permission for switch chmod 0600 /sys/class/sec/switch/jig_on - - chown system radio /sys/class/sec/switch/uart_sel - chown system radio /sys/class/sec/switch/usb_sel chown radio radio /sys/class/sec/switch/jig_on - chown system radio /sys/class/sec/switch/adc -# create data/gps for GPS demon + # create data/gps for GPS demon chown root system /dev/ttyO0 chmod 0660 /dev/ttyO0 chown root system /sys/class/sec/gps/GPS_PWR_EN/value @@ -225,32 +172,19 @@ on post-fs-data mkdir /data/gps 771 system system chown system system /data/gps -#Change permission for backlight and lcd + # Change permission for backlight chown system system /sys/class/backlight/panel/brightness - chown system radio /sys/class/lcd/panel/lcd_type - chown system radio /sys/class/lcd/panel/lcd_power -# IrLED + # IrLED chown system system /sys/class/sec/sec_ir/ir_send chown system system /sys/class/sec/sec_ir/check_ir -# Battery - chown system radio /sys/class/power_supply/battery/batt_reset_soc - chmod 0664 /sys/class/power_supply/battery/batt_reset_soc - -# for wifi + # for wifi mkdir /efs/wifi 0775 system radio -# for hdcp, amwbr - mkdir /data/misc/radio 0775 radio system - -# for hdmi factory test - chown radio system /sys/devices/platform/omapdss/display1/sec_timing - setprop vold.post_fs_data_done 1 on boot - # SMC Service service tf_daemon /system/bin/tf_daemon \ -d -c /system/bin/smc.ini @@ -342,10 +276,6 @@ service cpboot-daemon /sbin/cbd -d -p 8 user root group radio cache inet misc audio sdcard_rw log sdcard_r seclabel u:r:cpboot-daemon:s0 - disabled - -on property:init.svc.pvrsrvinit=stopped - start cpboot-daemon # GPS service gpsd /system/bin/gpsd -c /system/etc/gps.xml @@ -381,9 +311,6 @@ on property:ro.bootmode=charger start adbd on property:ro.bootmode=charger - start pvrsrvinit - -on property:ro.bootmode=charger class_start charger service charger /sbin/healthd -c diff --git a/rootdir/etc/ueventd.tab2.rc b/rootdir/etc/ueventd.tab2.rc index f67f204..3fa8bc2 100644 --- a/rootdir/etc/ueventd.tab2.rc +++ b/rootdir/etc/ueventd.tab2.rc @@ -1,13 +1,14 @@ #for DSSCOMP -/dev/dsscomp 0666 system system -/dev/tiler 0666 system system +/dev/dsscomp 0660 system system +/dev/tiler 0660 system system +/dev/ion 0770 media graphics #for SYSLINK -/dev/rpmsg-omx0 0660 system drmrpc -/dev/rpmsg-omx1 0660 system drmrpc -/dev/rproc_user 0660 system drmrpc -/dev/tf_driver 0660 drmrpc drmrpc -/dev/tf_ctrl 0660 drmrpc drmrpc +/dev/rpmsg-omx0 0660 drmrpc drmrpc +/dev/rpmsg-omx1 0660 drmrpc drmrpc +/dev/rproc_user 0660 drmrpc drmrpc +/dev/tf_driver 0660 drmrpc drmrpc +/dev/tf_ctrl 0660 drmrpc drmrpc #for Sensors /dev/mpu 0660 system system @@ -15,7 +16,7 @@ /dev/accelirq 0660 system system /dev/compassirq 0660 system system /dev/timerirq 0660 system system -/dev/i2c-4 0660 system system +/dev/i2c-4 0660 system system #for HSPA RIL /dev/umts_boot0 0660 radio radio @@ -28,31 +29,28 @@ /dev/umts_csd 0660 radio system # hdcp -/dev/hdcp 0664 root root +/dev/hdcp 0664 root root # used by RIL and GPS /dev/ttyO0 0660 system radio /dev/ttyGS0 0660 system system # for LTE RIL -/dev/cdma_boot0 0660 radio radio -/dev/lte_boot0 0660 radio radio -/dev/cdma_ipc0 0660 radio radio -/dev/lte_ipc0 0660 radio radio -/dev/cdma_rfs0 0660 radio radio -/dev/lte_rfs0 0660 radio radio -/dev/lte_spi 0660 radio radio -/dev/cdma_rmnet5 0660 radio radio -/dev/cdma_rmnet6 0660 radio radio -/dev/lte_rmnet4 0660 radio radio -/dev/ttyGS1 0660 radio radio -/dev/block/mmcblk0p4 0660 radio radio -/dev/modem_br 0660 radio radio -/dev/cdma_ramdump0 0660 radio radio -/dev/lte_ramdump0 0660 radio radio +/dev/cdma_boot0 0660 radio radio +/dev/lte_boot0 0660 radio radio +/dev/cdma_ipc0 0660 radio radio +/dev/lte_ipc0 0660 radio radio +/dev/cdma_rfs0 0660 radio radio +/dev/lte_rfs0 0660 radio radio +/dev/lte_spi 0660 radio radio +/dev/cdma_rmnet5 0660 radio radio +/dev/cdma_rmnet6 0660 radio radio +/dev/lte_rmnet4 0660 radio radio +/dev/ttyGS1 0660 radio radio +/dev/block/mmcblk0p4 0660 radio radio +/dev/modem_br 0660 radio radio +/dev/cdma_ramdump0 0660 radio radio +/dev/lte_ramdump0 0660 radio radio # For SGX -/dev/pvrsrvkm 0666 system system - -# For GCX -/dev/gcioctl 0666 system system +/dev/pvrsrvkm 0666 system system -- cgit v1.1