diff --git a/BoardConfig.mk b/BoardConfig.mk index 58b0078..c072da6 100755 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -62,7 +62,7 @@ BOARD_VENDOR_QCOM_AMSS_VERSION := 1550 BOARD_VENDOR_USE_AKMD := akm8973 -BOARD_EGL_CFG := device/htc/leo/egl.cfg +BOARD_EGL_CFG := device/htc/leo/prebuilt/egl.cfg BOARD_USE_FROYO_LIBCAMERA := true @@ -94,13 +94,13 @@ BOARD_FLASH_BLOCK_SIZE := 131072 TARGET_RELEASETOOLS_EXTENSIONS := device/htc/common -TARGET_PREBUILT_KERNEL := device/htc/leo/kernel +TARGET_PREBUILT_KERNEL := device/htc/leo/prebuilt/kernel # to enable the GPS HAL BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := leo # AMSS version to use for GPS BOARD_VENDOR_QCOM_GPS_LOC_API_AMSS_VERSION := 3200 -TARGET_PREBUILT_RECOVERY_KERNEL := device/htc/leo/recovery_kernel +TARGET_PREBUILT_RECOVERY_KERNEL := device/htc/leo/prebuilt/recovery_kernel BOARD_USES_RECOVERY_CHARGEMODE := true diff --git a/init.leo.rc b/init.leo.rc deleted file mode 100755 index a58ba66..0000000 --- a/init.leo.rc +++ /dev/null @@ -1,145 +0,0 @@ -on fs - mount yaffs2 mtd@system /system remount - -on boot - mount debugfs /sys/kernel/debug /sys/kernel/debug - - mkdir /data/misc/wifi 0770 wifi wifi - mkdir /data/misc/wifi/sockets 0770 wifi wifi - mkdir /data/misc/dhcp 0770 dhcp dhcp - chown dhcp dhcp /data/misc/dhcp - - # bluetooth power up/down interface - chown bluetooth bluetooth /sys/class/rfkill/rfkill0/type - chown bluetooth bluetooth /sys/class/rfkill/rfkill0/state - chmod 0660 /sys/class/rfkill/rfkill0/state - - chown radio radio /sys/module/pm/parameters/idle_sleep_mode - - # Set error receiver - setprop ro.error.receiver.htc.apps com.android.updater - - # ruu - write /data/misc/screen_lock_status 0 - chown system system /data/misc/screen_lock_status - chmod 644 /data/misc/screen_lock_status - - # for wireless modem - chown system system /sys/module/serial/parameters/modem_enabled - chown system system /dev/ttyHSUSB0 - chown system system /dev/smd9 - chown media media /sys/devices/system/cpu/cpu0/cpufreq/scaling_governor - - # Power Management - write /sys/devices/system/cpu/cpu0/cpufreq/ondemand/sampling_rate 40000 - - # Overwrite framework low memory killer minfree setting - write /sys/module/lowmemorykiller/parameters/minfree 3584,4096,6144,7168,7680,8192 - - # Enable low memory killer to check file pages - write /sys/module/lowmemorykiller/parameters/minfile 0,0,0,5120,5632,6144 - write /sys/module/lowmemorykiller/parameters/check_filepages - - -service hciattach /system/bin/brcm_patchram_plus --enable_hci\ - --baudrate 3000000 --patchram /etc/firmware/bcm4329.hcd /dev/ttyHS0 - user bluetooth - group bluetooth net_bt_admin - disabled - -#service btld /system/bin/logwrapper /system/bin/btld -lpm 1 -hb 3000000 -# user root -# group bluetooth net_bt_admin -# disabled -# oneshot - -# compass/accelerometer daemon -service akmd /system/bin/akmd - user compass - group compass misc input - -service wpa_supplicant /system/bin/wpa_supplicant \ - -Dwext -ieth0 -c/data/misc/wifi/wpa_supplicant.conf - #user wifi - #group wifi inet - socket wpa_eth0 dgram 660 wifi wifi - disabled - oneshot - -service dhcpcd_eth0 /system/bin/dhcpcd -ABKL - disabled - oneshot - -service iprenew_eth0 /system/bin/dhcpcd -n - disabled - oneshot - -# for USB internet sharing -service udhcpd /system/bin/udhcpd - disabled - oneshot - -#service netsharing_on /system/bin/netsharing net on -# disabled -# oneshot - -#service netsharing_off /system/bin/netsharing net off -# disabled -# oneshot - -#service netsharing_pass /system/bin/netsharing net_pass on -# disabled -# oneshot - -#service modem /system/xbin/wireless_modem -# user system -# group system -# disabled - -#service zchgd /system/bin/zchgd -# user root -# group root graphics -# oneshot - -service dumpstate /system/bin/dumpstate -s - socket dumpstate stream 0660 shell log - disabled - oneshot - -#on property:dev.bootcomplete=1 -# start bootcomplete - -#service bootcomplete /system/bin/bootcomplete -# user root -# group root -# disabled -# oneshot - -#service shutdown /system/bin/shutdown -# user root -# group root -# disabled -# oneshot - -#service ipd /system/bin/ipd -# socket ipd stream 666 root inet - -# Execute files in /etc/init.d before booting -#service sysinit /system/bin/logwrapper /system/xbin/busybox run-parts /system/etc/init.d -# disabled -# oneshot - -#on property:service.modem.enable=1 -# start modem - -#on property:service.modem.enable=0 -# stop modem - -#service srv_ser2net /system/bin/ser2net -n -# disabled - -#on property:service.ser2net.enable=1 -# start srv_ser2net - -#on property:service.ser2net.enable=0 -# stop srv_ser2net diff --git a/h2w_headset.kl b/keylayout/h2w_headset.kl similarity index 100% rename from h2w_headset.kl rename to keylayout/h2w_headset.kl diff --git a/leo-keypad.kcm.bin b/keylayout/leo-keypad.kcm.bin similarity index 100% rename from leo-keypad.kcm.bin rename to keylayout/leo-keypad.kcm.bin diff --git a/leo-keypad.kl b/keylayout/leo-keypad.kl similarity index 100% rename from leo-keypad.kl rename to keylayout/leo-keypad.kl diff --git a/leo.mk b/leo.mk index 5d303f9..484a89e 100755 --- a/leo.mk +++ b/leo.mk @@ -23,7 +23,7 @@ ## (1) First, the most specific values, i.e. the aspects that are specific to GSM PRODUCT_COPY_FILES += \ - device/htc/leo/init.htcleo.rc:root/init.htcleo.rc \ + device/htc/leo/prebuilt/init.htcleo.rc:root/init.htcleo.rc \ # we have enough storage space to hold precise GC data PRODUCT_TAGS += dalvik.gc.type-precise @@ -49,6 +49,10 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/htc/leo/media_profiles.xml:system/etc/media_profiles.xml +# This file is used to install the enable RMNET and corresponding modules which dont get activated by normal module script +PRODUCT_COPY_FILES += \ + device/htc/leo/prebuilt/01modules:system/etc/init.d/01modules + PRODUCT_PACKAGES += \ sensors.htcleo \ lights.htcleo \ @@ -66,13 +70,13 @@ PRODUCT_PACKAGES += \ PRODUCT_LOCALES := hdpi PRODUCT_COPY_FILES += \ - device/htc/leo/vold.fstab:system/etc/vold.fstab + device/htc/leo/prebuilt/vold.fstab:system/etc/vold.fstab # Keylayouts PRODUCT_COPY_FILES += \ - device/htc/leo/leo-keypad.kl:system/usr/keylayout/leo-keypad.kl \ - device/htc/leo/leo-keypad.kcm.bin:system/usr/keychars/leo-keypad.kcm.bin \ - device/htc/leo/h2w_headset.kl:system/usr/keylayout/h2w_headset.kl + device/htc/leo/keylayout/leo-keypad.kl:system/usr/keylayout/leo-keypad.kl \ + device/htc/leo/keylayout/leo-keypad.kcm.bin:system/usr/keychars/leo-keypad.kcm.bin \ + device/htc/leo/keylayout/h2w_headset.kl:system/usr/keylayout/h2w_headset.kl # Firmware PRODUCT_COPY_FILES += \ @@ -85,25 +89,25 @@ vendor/cyanogen/prebuilt/common/etc/apns-conf.xml:system/etc/apns-conf.xml PRODUCT_COPY_FILES += \ - device/htc/leo/modules/bcm4329.ko:system/lib/modules/bcm4329.ko \ - device/htc/leo/modules/cifs.ko:system/lib/modules/cifs.ko \ - device/htc/leo/modules/msm_rmnet.ko:system/lib/modules/msm_rmnet.ko \ - device/htc/leo/modules/nls_utf8.ko:system/lib/modules/nls_utf8.ko \ - device/htc/leo/modules/tun.ko:system/lib/modules/tun.ko \ - device/htc/leo/modules/fuse.ko:system/lib/modules/fuse.ko + device/htc/leo/prebuilt/modules/bcm4329.ko:system/lib/modules/bcm4329.ko \ + device/htc/leo/prebuilt/modules/cifs.ko:system/lib/modules/cifs.ko \ + device/htc/leo/prebuilt/modules/msm_rmnet.ko:system/lib/modules/msm_rmnet.ko \ + device/htc/leo/prebuilt/modules/nls_utf8.ko:system/lib/modules/nls_utf8.ko \ + device/htc/leo/prebuilt/modules/tun.ko:system/lib/modules/tun.ko \ + device/htc/leo/prebuilt/modules/fuse.ko:system/lib/modules/fuse.ko PRODUCT_COPY_FILES += \ - device/htc/leo/kernel:boot/zImage \ + device/htc/leo/prebuilt/kernel:boot/zImage \ ifeq ($(TARGET_PREBUILT_KERNEL),) -LOCAL_KERNEL := device/htc/leo/kernel +LOCAL_KERNEL := device/htc/leo/prebuilt/kernel else LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL) endif # The gps config appropriate for this device PRODUCT_COPY_FILES += \ - device/htc/leo/gps.conf:system/etc/gps.conf + device/htc/leo/prebuilt/gps.conf:system/etc/gps.conf PRODUCT_COPY_FILES += \ $(LOCAL_KERNEL):kernel diff --git a/leo_eu.mk b/leo_eu.mk index 83d2236..df93a27 100755 --- a/leo_eu.mk +++ b/leo_eu.mk @@ -21,7 +21,7 @@ # The gps config appropriate for this device PRODUCT_COPY_FILES += \ - device/htc/leo/gps_eu.conf:system/etc/gps.conf + device/htc/leo/prebuilt/gps_eu.conf:system/etc/gps.conf # The rest of the configuration is inherited from a generic config diff --git a/prebuilt/01modules b/prebuilt/01modules new file mode 100644 index 0000000..5ad743c --- /dev/null +++ b/prebuilt/01modules @@ -0,0 +1,16 @@ +#!/system/bin/sh +# +# Load MODULES +sleep 1 +if [ -f /system/ppp ] +then + echo "Not loading RMNET module as /system/ppp exists" +else + echo "Loading RMNET module as /system/ppp doesn't exist" + insmod /system/lib/modules/msm_rmnet.ko +fi +insmod /system/lib/modules/tun.ko +insmod /system/lib/modules/cifs.ko +insmod /system/lib/modules/nls_utf8.ko +insmod /system/lib/modules/fuse.ko +echo "+++ TUN / CIFS activated +++"; diff --git a/egl.cfg b/prebuilt/egl.cfg similarity index 100% rename from egl.cfg rename to prebuilt/egl.cfg diff --git a/gps.conf b/prebuilt/gps.conf similarity index 100% rename from gps.conf rename to prebuilt/gps.conf diff --git a/gps_eu.conf b/prebuilt/gps_eu.conf similarity index 100% rename from gps_eu.conf rename to prebuilt/gps_eu.conf diff --git a/init.htcleo.rc b/prebuilt/init.htcleo.rc similarity index 92% rename from init.htcleo.rc rename to prebuilt/init.htcleo.rc index 4c39308..cc079df 100644 --- a/init.htcleo.rc +++ b/prebuilt/init.htcleo.rc @@ -108,7 +108,26 @@ on boot # Enable low memory killer to check file pages write /sys/module/lowmemorykiller/parameters/minfile 0,0,0,5120,5632,6144 write /sys/module/lowmemorykiller/parameters/check_filepages + + # PPP stuff + chown radio radio /dev/smd1 + chown root radio /system/etc/ppp + chown root root /system/bin/pppd; + chmod 755 /system/etc/ppp/* + chmod 4755 /system/bin/pppd + if [ -f /system/ppp ] + then + # PPP enabled, doing PPP specific stuff + + # Create link for resolv.conf (generated by pppd) + symlink /etc/ppp/resolv.conf /etc/resolv.conf + + # Tweak kernel low memory handling + write /proc/sys/vm/lowmem_reserve_ratio 8 8 + write /proc/sys/vm/min_free_kbytes 8192 + fi + service hciattach /system/bin/brcm_patchram_plus --enable_hci \ --baudrate 3000000 --patchram /etc/firmware/bcm4329.hcd /dev/ttyHS0 diff --git a/prebuilt/init.leo.rc b/prebuilt/init.leo.rc new file mode 120000 index 0000000..5a5346f --- /dev/null +++ b/prebuilt/init.leo.rc @@ -0,0 +1 @@ +init.htcleo.rc \ No newline at end of file diff --git a/kernel b/prebuilt/kernel similarity index 100% rename from kernel rename to prebuilt/kernel diff --git a/modules/bcm4329.ko b/prebuilt/modules/bcm4329.ko similarity index 100% rename from modules/bcm4329.ko rename to prebuilt/modules/bcm4329.ko diff --git a/modules/cifs.ko b/prebuilt/modules/cifs.ko similarity index 100% rename from modules/cifs.ko rename to prebuilt/modules/cifs.ko diff --git a/modules/fuse.ko b/prebuilt/modules/fuse.ko similarity index 100% rename from modules/fuse.ko rename to prebuilt/modules/fuse.ko diff --git a/modules/kineto_gan.ko b/prebuilt/modules/kineto_gan.ko similarity index 100% rename from modules/kineto_gan.ko rename to prebuilt/modules/kineto_gan.ko diff --git a/modules/msm_rmnet.ko b/prebuilt/modules/msm_rmnet.ko similarity index 100% rename from modules/msm_rmnet.ko rename to prebuilt/modules/msm_rmnet.ko diff --git a/modules/nls_utf8.ko b/prebuilt/modules/nls_utf8.ko similarity index 100% rename from modules/nls_utf8.ko rename to prebuilt/modules/nls_utf8.ko diff --git a/modules/tun.ko b/prebuilt/modules/tun.ko similarity index 100% rename from modules/tun.ko rename to prebuilt/modules/tun.ko diff --git a/recovery_kernel b/prebuilt/recovery_kernel similarity index 100% rename from recovery_kernel rename to prebuilt/recovery_kernel diff --git a/ueventd.leo.rc b/prebuilt/ueventd.htcleo.rc similarity index 100% rename from ueventd.leo.rc rename to prebuilt/ueventd.htcleo.rc diff --git a/vold.fstab b/prebuilt/vold.fstab similarity index 100% rename from vold.fstab rename to prebuilt/vold.fstab