Merge branch 'jb' of github.com:KFire-Android/device-amazon-otter int…

…o jb
uejji · Aug 9, 2012 · 67a54c3 · 67a54c3
2 parents fac463b + 959811f
commit 67a54c3
Show file tree

Hide file tree

Showing 16 changed files with 98 additions and 61 deletions.
diff --git a/device.mk b/device.mk
@@ -50,10 +50,6 @@ PRODUCT_PACKAGES += \
 # TI proprietary firmware / binaries
 PRODUCT_PACKAGES += \
     ti_omap4_sgx_libs \
-    wl1271-nvs_127x.bin \
-    wl127x-fw-4-mr \
-    wl127x-fw-4-plt \
-    wl127x-fw-4-sr
 
 # Misc
 PRODUCT_PACKAGES += \
@@ -167,7 +163,8 @@ PRODUCT_PROPERTY_OVERRIDES := \
     com.ti.omap_enhancement=true \
     omap.enhancement=true \
     ro.crypto.state=unencrypted \
-    persist.sys.usb.config=mass_storage,adb
+    persist.sys.usb.config=mass_storage,adb \
+    persist.sys.root_access=1
 
 
 PRODUCT_CHARACTERISTICS := tablet,nosdcard
@@ -187,5 +184,6 @@ $(call inherit-product, frameworks/native/build/tablet-dalvik-heap.mk)
 
 $(call inherit-product-if-exists, vendor/amazon/otter/otter-vendor.mk)
 $(call inherit-product, hardware/ti/omap4xxx/omap4.mk)
+$(call inherit-product, device/ti/proprietary-open/wl12xx/wlan/wl12xx-wlan-fw-products.mk)
 
 
diff --git a/kernel b/kernel
diff --git a/modules/ansi_cprng.ko b/modules/ansi_cprng.ko
diff --git a/modules/cfg80211.ko b/modules/cfg80211.ko
diff --git a/modules/compat.ko b/modules/compat.ko
diff --git a/modules/mac80211.ko b/modules/mac80211.ko
diff --git a/modules/nls_utf8.ko b/modules/nls_utf8.ko
diff --git a/modules/pvrsrvkm_sgx540_120.ko b/modules/pvrsrvkm_sgx540_120.ko
diff --git a/modules/pvrsrvkm_sgx544_112.ko b/modules/pvrsrvkm_sgx544_112.ko
diff --git a/modules/scsi_wait_scan.ko b/modules/scsi_wait_scan.ko
diff --git a/modules/tun.ko b/modules/tun.ko
diff --git a/modules/wl12xx.ko b/modules/wl12xx.ko
diff --git a/modules/wl12xx_sdio.ko b/modules/wl12xx_sdio.ko
diff --git a/modules/wl12xx_spi.ko b/modules/wl12xx_spi.ko
diff --git a/root/init.omap4430.rc b/root/init.omap4430.rc
@@ -1,7 +1,8 @@
 import init.omap4430.usb.rc
 
-on early-init
+on init
     export EXTERNAL_STORAGE /storage/sdcard0
+    export DOWNLOAD_CACHE /cache/download
     mkdir /storage 0050 system sdcard_r
     mkdir /storage/sdcard0 0000 system system
     # for backwards compatibility
@@ -12,63 +13,29 @@ on early-init
     mkdir /storage/usb0 0000 system system
     mkdir /storage/usb1 0000 system system
 
-on init
-    export DOWNLOAD_CACHE /cache/download
-
 # power management
 # Enable off mode by default
 #    write /sys/kernel/debug/pm_debug/enable_off_mode 1
 
-on post-fs-data
-    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
-    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
-
-# forget what this fixed
-    mkdir /data/tmp 0777 system system
-    symlink /data/tmp /tmp
-
-# make dir for trace
-    mkdir /data/trace 0777 system system
-    chmod 0777 /data/trace
-
-	# camera calibration
-#	mkdir /data/misc/camera 0770 media media
-#	mkdir /data/misc/camera/R5_MVEN003_LD2_ND0_IR0_SH0_FL1_SVEN003_DCCID1044 0770 media media
+on fs
+    mkdir /factory 0775 radio radio
+    mount ext4 /dev/block/mmcblk0p9 /system wait ro
+    mount ext4 /dev/block/mmcblk0p10 /data wait noatime nosuid nodev errors=continue discard
+    mount ext4 /dev/block/mmcblk0p11 /cache wait noatime nosuid nodev errors=continue discard
+    mount ext4 /dev/block/mmcblk0p8 /dropbox wait noatime nosuid nodev errors=continue discard
 
-#   mkdir /data/radio 0775 radio radio
-#   mkdir /data/radio/log 0775 radio radio
+# pvr module
+    insmod /system/lib/modules/pvrsrvkm_sgx540_120.ko
 
+on post-fs
 # make dir for cache
     mkdir /cache/download 0777 system system
 
 # We chown/chmod /data again so because mount is run as root + defaults
 #    chown system system /data
 #    chmod 0771 /data
 
-    setprop vold.post_fs_data_done 1
-
-
-on boot
-    mount debugfs /sys/kernel/debug /sys/kernel/debug
-
-    setprop ro.build.product omap4sdp
-    setprop ro.product.device omap4sdp
-    setprop ro.radio.noril yes
-
-# fake some battery state
-    setprop status.battery.state Slow
-    setprop status.battery.level 5
-    setprop status.battery.level_raw  50
-    setprop status.battery.level_scale 9
-
     chmod 0666 /dev/pvrsrvkm
-    chmod 0444 /proc/kmsg
 
 # change permissions for mtd device
     chmod 0660 /dev/mtd/mtd0
@@ -101,8 +68,6 @@ on boot
     write /sys/devices/system/cpu/cpu0/cpufreq/boost_cpufreq 1
 
 # wi-fi
-    mkdir /data/misc/wifi/sockets 0770 wifi wifi
-    mkdir /data/misc/dhcp 0770 dhcp dhcp
     insmod /system/lib/modules/compat.ko
     insmod /system/lib/modules/cfg80211.ko
     insmod /system/lib/modules/mac80211.ko
@@ -111,16 +76,6 @@ on boot
 # GPS
 #   insmod /system/lib/modules/gps_drv.ko
 
-on fs
-    mkdir /factory 0775 radio radio
-    mount ext4 /dev/block/mmcblk0p9 /system wait ro
-    mount ext4 /dev/block/mmcblk0p10 /data wait noatime nosuid nodev errors=continue discard
-    mount ext4 /dev/block/mmcblk0p11 /cache wait noatime nosuid nodev errors=continue discard
-    mount ext4 /dev/block/mmcblk0p8 /dropbox wait noatime nosuid nodev errors=continue discard
-
-# pvr module
-    insmod /system/lib/modules/pvrsrvkm_sgx540_120.ko
-
 # H264 Encoder Profile setting
 # 1 - Base Profile
 # 2 - Main Profile
@@ -176,6 +131,44 @@ on fs
     chown system system /system/bin/omapconf
     chown root root /system/bin/omapconf2
 
+    # change permissions for overlay managers and display devices
+    chown system system /sys/devices/platform/omapdss/display0/enabled
+    chown system system /sys/devices/platform/omapdss/display1/enabled
+    chown system system /sys/devices/platform/omapdss/display2/enabled
+    chown system system /sys/devices/platform/omapdss/display3/enabled
+    chown system system /sys/devices/platform/omapdss/display0/name
+    chown system system /sys/devices/platform/omapdss/display1/name
+    chown system system /sys/devices/platform/omapdss/display2/name
+    chown system system /sys/devices/platform/omapdss/display3/name
+    chown system system /sys/devices/platform/omapdss/overlay0/manager
+    chown system system /sys/devices/platform/omapdss/overlay1/manager
+    chown system system /sys/devices/platform/omapdss/overlay2/manager
+    chown system system /sys/devices/platform/omapdss/overlay3/manager
+    chown system system /sys/devices/platform/omapdss/overlay0/zorder
+    chown system system /sys/devices/platform/omapdss/overlay1/zorder
+    chown system system /sys/devices/platform/omapdss/overlay2/zorder
+    chown system system /sys/devices/platform/omapdss/overlay3/zorder
+    # change permissions for manager tranparency parameters
+    chown system system /sys/devices/platform/omapdss/manager0/name
+    chown system system /sys/devices/platform/omapdss/manager0/display
+    chown system system /sys/devices/platform/omapdss/manager1/name
+    chown system system /sys/devices/platform/omapdss/manager1/display
+    chown system system /sys/devices/platform/omapdss/manager2/name
+    chown system system /sys/devices/platform/omapdss/manager2/display
+    chown system system /sys/devices/platform/omapdss/overlay0/enabled
+    chown system system /sys/devices/platform/omapdss/overlay1/enabled
+    chown system system /sys/devices/platform/omapdss/overlay2/enabled
+    chown system system /sys/devices/platform/omapdss/overlay3/enabled
+    # change permissions for display timings to get the resolutions
+    chown system system /sys/devices/platform/omapdss/display0/timings
+    chown system system /sys/devices/platform/omapdss/display1/timings
+    chown system system /sys/devices/platform/omapdss/display2/timings
+    chown system system /sys/devices/platform/omapdss/display3/timings
+    chown system system /sys/devices/platform/omapdss/display2/code
+     # change permissions for Tiler driver
+    chown media media /dev/tiler
+    chmod 0666 /dev/tiler
+    chmod 0666 /dev/dmm
 # LEDs
     chmod 0777 /dev/ilitek_ctrl
     chmod 0777 /sys/class/leds/lcd-backlight/brightness
@@ -195,6 +188,48 @@ on fs
     chown system system /sys/class/power_supply/usb/device/float_voltage
     chown system system /sys/class/power_supply/usb/device/bad_battery
 
+on post-fs-data
+
+# forget what this fixed
+    mkdir /data/tmp 0777 system system
+    symlink /data/tmp /tmp
+
+# make dir for trace
+    mkdir /data/trace 0777 system system
+    chmod 0777 /data/trace
+
+	# camera calibration
+#	mkdir /data/misc/camera 0770 media media
+#	mkdir /data/misc/camera/R5_MVEN003_LD2_ND0_IR0_SH0_FL1_SVEN003_DCCID1044 0770 media media
+
+#   mkdir /data/radio 0775 radio radio
+#   mkdir /data/radio/log 0775 radio radio
+
+# wifi
+    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
+    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
+
+    setprop vold.post_fs_data_done 1
+
+on boot
+    mount debugfs /sys/kernel/debug /sys/kernel/debug
+
+    setprop ro.build.product omap4sdp
+    setprop ro.product.device omap4sdp
+    setprop ro.radio.noril yes
+
+# fake some battery state
+    setprop status.battery.state Slow
+    setprop status.battery.level 5
+    setprop status.battery.level_raw  50
+    setprop status.battery.level_scale 9
+
 service fixmac /system/bin/fix-mac.sh
     class core
     user root
@@ -300,3 +335,6 @@ service hostapd_bin /system/bin/hostapd -d /data/misc/wifi/hostapd.conf
 #    user root
 #    oneshot
 
+on property:sys.boot_completed=1
+    log "== init.omap4430.rc: on property:sys.boot_completed=1 -----------------------"
+
diff --git a/vendorsetup.sh b/vendorsetup.sh
@@ -16,3 +16,4 @@
 
 add_lunch_combo full_otter-userdebug
 add_lunch_combo cm_otter-userdebug
+add_lunch_combo cm_otter-eng
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,3 +16,4 @@

		add_lunch_combo full_otter-userdebug
		add_lunch_combo cm_otter-userdebug
		add_lunch_combo cm_otter-eng