Merge "proprietary-open: rule to install wpan fw" into jb-release

diff --git a/omap4/README.SGX b/omap4/README.SGX
index b3911d44267962ea458beddd0ae41b01fa4c1f43..a87eb58c7fdc1048380857252923644ae602235e 100644 (file)
--- a/omap4/README.SGX
+++ b/omap4/README.SGX
@@ -8,11 +8,11 @@ wrapper which detects the current processor and loads the corresponding core spe
 pvrsrvinit.
 
 [DDK Version]
-    1.9@956766
+    1.9@2120756
 [DDK commit ID]
-    28c171c SGX-UM: Don't load omaplfb module when in-kernel driver is present
+    18545f4 SGX UM: HACK: add extra read in SGXInitialise Script 1
 [Branch]
-    1.9/956766
+    1.9/2120756
 [Kernel modules built against]
     Kernel Version: 3.0.31 with CONFIG_MODVERSIONS=y and CONFIG_SCHED_TRACER=y
 
@@ -78,11 +78,9 @@ Once the .ko's are built, install them onto device (/system/lib/modules)
 For 4460:
 # cd ANDROID_ROOT/device/ti/proprietary-open/omap4/sgx_src/eurasia_km/eurasiacon/binary2_540_120_omap4430_android_release/target/
 # adb push pvrsrvkm_sgx540_120.ko /system/lib/modules/
-# adb push omaplfb_sgx540_120.ko /system/lib/modules/
 
 For 4470
 # cd ANDROID_ROOT/device/ti/proprietary-open/omap4/sgx_src/eurasia_km/eurasiacon/binary2_544_120_omap4430_android_release/target/
 # adb push pvrsrvkm_sgx544_112.ko /system/lib/modules/
-# adb push omaplfb_sgx544_112.ko /system/lib/modules/
 
 Reboot device.

diff --git a/omap4/sgx.tgz b/omap4/sgx.tgz
index d9b20a04fed091e59f94a704e55e6e4562d60191..b4a79d61eb75fe7ab085ba7a49bc3619c9645880 100644 (file)
Binary files a/omap4/sgx.tgz and b/omap4/sgx.tgz differ

diff --git a/omap4/sgx_src/eurasia_km.tgz b/omap4/sgx_src/eurasia_km.tgz
index 82fd68adba35f046988ed3013e871ecc7a78f4c1..d6cdaef4fee5d36567a7c55658995277db772a50 100644 (file)
Binary files a/omap4/sgx_src/eurasia_km.tgz and b/omap4/sgx_src/eurasia_km.tgz differ