diff --git a/boot/fixup.dat b/boot/fixup.dat index 6b2cf9f2f995..18212b5735d6 100644 Binary files a/boot/fixup.dat and b/boot/fixup.dat differ diff --git a/boot/fixup_cd.dat b/boot/fixup_cd.dat index 0838f048eb09..c927b65052b4 100644 Binary files a/boot/fixup_cd.dat and b/boot/fixup_cd.dat differ diff --git a/boot/fixup_x.dat b/boot/fixup_x.dat index 261671be7f4d..90111cba4adb 100644 Binary files a/boot/fixup_x.dat and b/boot/fixup_x.dat differ diff --git a/boot/kernel.img b/boot/kernel.img index c3419d7fbd4b..bc3dc9a60ef9 100644 Binary files a/boot/kernel.img and b/boot/kernel.img differ diff --git a/boot/kernel_emergency.img b/boot/kernel_emergency.img index 47aee76d1e6a..8a5071585dd2 100644 Binary files a/boot/kernel_emergency.img and b/boot/kernel_emergency.img differ diff --git a/boot/start.elf b/boot/start.elf index d95c1eacb76f..2d58650cef8a 100644 Binary files a/boot/start.elf and b/boot/start.elf differ diff --git a/boot/start_cd.elf b/boot/start_cd.elf index f10d2d3b2958..cab85a6ff8c4 100644 Binary files a/boot/start_cd.elf and b/boot/start_cd.elf differ diff --git a/boot/start_x.elf b/boot/start_x.elf index 2b125febb2fd..0459bbaf659c 100644 Binary files a/boot/start_x.elf and b/boot/start_x.elf differ diff --git a/extra/git_hash b/extra/git_hash index 2a60099c3d5d..1f92e08b2301 100644 --- a/extra/git_hash +++ b/extra/git_hash @@ -1 +1 @@ -d8ace32b28d672b565dadc9da78fe2cf6237257d +e959a8e5d1d0f4147d31ddd09c263a5e405637e2 diff --git a/extra/uname_string b/extra/uname_string index 2d5d57106158..71f7f4595868 100644 --- a/extra/uname_string +++ b/extra/uname_string @@ -1 +1 @@ -Linux version 3.6.11+ (dc4@dc4-arm-01) (gcc version 4.7.2 20120731 (prerelease) (crosstool-NG linaro-1.13.1+bzr2458 - Linaro GCC 2012.08) ) #393 PREEMPT Fri Mar 8 16:36:28 GMT 2013 +Linux version 3.6.11+ (dc4@dc4-arm-01) (gcc version 4.7.2 20120731 (prerelease) (crosstool-NG linaro-1.13.1+bzr2458 - Linaro GCC 2012.08) ) #397 PREEMPT Mon Mar 18 22:17:49 GMT 2013 diff --git a/hardfp/opt/vc/bin/tvservice b/hardfp/opt/vc/bin/tvservice index 4075d6882696..a20d95e7f96c 100755 Binary files a/hardfp/opt/vc/bin/tvservice and b/hardfp/opt/vc/bin/tvservice differ diff --git a/hardfp/opt/vc/bin/vcdbg b/hardfp/opt/vc/bin/vcdbg index 9810935c73ae..673c3a23b5c0 100755 Binary files a/hardfp/opt/vc/bin/vcdbg and b/hardfp/opt/vc/bin/vcdbg differ diff --git a/hardfp/opt/vc/bin/vchiq_test b/hardfp/opt/vc/bin/vchiq_test index 109c6715c6af..b4b3d0074cbe 100755 Binary files a/hardfp/opt/vc/bin/vchiq_test and b/hardfp/opt/vc/bin/vchiq_test differ diff --git a/hardfp/opt/vc/include/interface/vcos/pthreads/vcos_platform.h b/hardfp/opt/vc/include/interface/vcos/pthreads/vcos_platform.h index c6550a7ae29c..465abd297194 100644 --- a/hardfp/opt/vc/include/interface/vcos/pthreads/vcos_platform.h +++ b/hardfp/opt/vc/include/interface/vcos/pthreads/vcos_platform.h @@ -57,6 +57,7 @@ extern "C" { #include #include #include +#include #define VCOS_HAVE_RTOS 1 @@ -723,6 +724,11 @@ char *vcos_strdup(const char *str) typedef void (*VCOS_ISR_HANDLER_T)(VCOS_UNSIGNED vecnum); +#define VCOS_DL_LAZY RTLD_LAZY +#define VCOS_DL_NOW RTLD_NOW +#define VCOS_DL_LOCAL RTLD_LOCAL +#define VCOS_DL_GLOBAL RTLD_GLOBAL + #ifdef __cplusplus } #endif diff --git a/hardfp/opt/vc/include/interface/vcos/vcos_dlfcn.h b/hardfp/opt/vc/include/interface/vcos/vcos_dlfcn.h index 3a2ed240c41d..f017a9e7c8b2 100644 --- a/hardfp/opt/vc/include/interface/vcos/vcos_dlfcn.h +++ b/hardfp/opt/vc/include/interface/vcos/vcos_dlfcn.h @@ -39,9 +39,6 @@ VCOS - abstraction over dynamic library opening extern "C" { #endif -#define VCOS_DL_LAZY 1 -#define VCOS_DL_NOW 2 - /** * \file * @@ -51,7 +48,7 @@ extern "C" { /** Open a dynamic library. * * @param name name of the library - * @param mode Load lazily or immediately (VCOS_DL_LAZY, VCOS_DL_NOW). + * @param mode Load lazily or immediately (VCOS_DL_LAZY, VCOS_DL_NOW, VCOS_DL_LOCAL, VCOS_DL_GLOBAL). * * @return A handle for use in subsequent calls. */ diff --git a/hardfp/opt/vc/lib/libEGL.so b/hardfp/opt/vc/lib/libEGL.so index a75083d773c3..cbaea5c97553 100644 Binary files a/hardfp/opt/vc/lib/libEGL.so and b/hardfp/opt/vc/lib/libEGL.so differ diff --git a/hardfp/opt/vc/lib/libEGL_static.a b/hardfp/opt/vc/lib/libEGL_static.a index ebb8331712e3..0d31712e2b30 100644 Binary files a/hardfp/opt/vc/lib/libEGL_static.a and b/hardfp/opt/vc/lib/libEGL_static.a differ diff --git a/hardfp/opt/vc/lib/libGLESv1_CM.so b/hardfp/opt/vc/lib/libGLESv1_CM.so index bc7910fc2cc7..3df183800fbe 100644 Binary files a/hardfp/opt/vc/lib/libGLESv1_CM.so and b/hardfp/opt/vc/lib/libGLESv1_CM.so differ diff --git a/hardfp/opt/vc/lib/libGLESv2.so b/hardfp/opt/vc/lib/libGLESv2.so index bc7910fc2cc7..3df183800fbe 100644 Binary files a/hardfp/opt/vc/lib/libGLESv2.so and b/hardfp/opt/vc/lib/libGLESv2.so differ diff --git a/hardfp/opt/vc/lib/libGLESv2_static.a b/hardfp/opt/vc/lib/libGLESv2_static.a index 5de9d22670df..29683200b63f 100644 Binary files a/hardfp/opt/vc/lib/libGLESv2_static.a and b/hardfp/opt/vc/lib/libGLESv2_static.a differ diff --git a/hardfp/opt/vc/lib/libWFC.so b/hardfp/opt/vc/lib/libWFC.so index fee9d6fa0ea6..10ae36337d45 100644 Binary files a/hardfp/opt/vc/lib/libWFC.so and b/hardfp/opt/vc/lib/libWFC.so differ diff --git a/hardfp/opt/vc/lib/libbcm_host.so b/hardfp/opt/vc/lib/libbcm_host.so index 5a496c17d8d3..0b911092f890 100644 Binary files a/hardfp/opt/vc/lib/libbcm_host.so and b/hardfp/opt/vc/lib/libbcm_host.so differ diff --git a/hardfp/opt/vc/lib/libdebug_sym.so b/hardfp/opt/vc/lib/libdebug_sym.so index cdfac5a6287d..a8d8663a88e1 100644 Binary files a/hardfp/opt/vc/lib/libdebug_sym.so and b/hardfp/opt/vc/lib/libdebug_sym.so differ diff --git a/hardfp/opt/vc/lib/libkhrn_client.a b/hardfp/opt/vc/lib/libkhrn_client.a index b848e25fdfcd..cf041c5b1377 100644 Binary files a/hardfp/opt/vc/lib/libkhrn_client.a and b/hardfp/opt/vc/lib/libkhrn_client.a differ diff --git a/hardfp/opt/vc/lib/libkhrn_static.a b/hardfp/opt/vc/lib/libkhrn_static.a index a8774bfce661..a94d613a27c8 100644 Binary files a/hardfp/opt/vc/lib/libkhrn_static.a and b/hardfp/opt/vc/lib/libkhrn_static.a differ diff --git a/hardfp/opt/vc/lib/libmmal.so b/hardfp/opt/vc/lib/libmmal.so index 91b4dff9edbe..a79636b476af 100644 Binary files a/hardfp/opt/vc/lib/libmmal.so and b/hardfp/opt/vc/lib/libmmal.so differ diff --git a/hardfp/opt/vc/lib/libmmal_vc_client.so b/hardfp/opt/vc/lib/libmmal_vc_client.so index ec5068855735..f2c9c7e39dee 100644 Binary files a/hardfp/opt/vc/lib/libmmal_vc_client.so and b/hardfp/opt/vc/lib/libmmal_vc_client.so differ diff --git a/hardfp/opt/vc/lib/libopenmaxil.so b/hardfp/opt/vc/lib/libopenmaxil.so index 5ca8da8cb795..cfd575a62a45 100644 Binary files a/hardfp/opt/vc/lib/libopenmaxil.so and b/hardfp/opt/vc/lib/libopenmaxil.so differ diff --git a/hardfp/opt/vc/lib/libvcfiled_check.a b/hardfp/opt/vc/lib/libvcfiled_check.a index eebe00c3f170..b85ccf64a694 100644 Binary files a/hardfp/opt/vc/lib/libvcfiled_check.a and b/hardfp/opt/vc/lib/libvcfiled_check.a differ diff --git a/hardfp/opt/vc/lib/libvchiq_arm.so b/hardfp/opt/vc/lib/libvchiq_arm.so index 778e177ed596..d55580a806fa 100644 Binary files a/hardfp/opt/vc/lib/libvchiq_arm.so and b/hardfp/opt/vc/lib/libvchiq_arm.so differ diff --git a/hardfp/opt/vc/lib/libvchostif.a b/hardfp/opt/vc/lib/libvchostif.a index 907a99c010ad..6ae6508e53ae 100644 Binary files a/hardfp/opt/vc/lib/libvchostif.a and b/hardfp/opt/vc/lib/libvchostif.a differ diff --git a/hardfp/opt/vc/lib/libvcos.so b/hardfp/opt/vc/lib/libvcos.so index c2806b87eab1..b6dd97989420 100644 Binary files a/hardfp/opt/vc/lib/libvcos.so and b/hardfp/opt/vc/lib/libvcos.so differ diff --git a/hardfp/opt/vc/lib/libvmcs_rpc_client.a b/hardfp/opt/vc/lib/libvmcs_rpc_client.a index 636a62d58e28..4be4de182739 100644 Binary files a/hardfp/opt/vc/lib/libvmcs_rpc_client.a and b/hardfp/opt/vc/lib/libvmcs_rpc_client.a differ diff --git a/hardfp/opt/vc/sbin/vcfiled b/hardfp/opt/vc/sbin/vcfiled index 0ffb53d9f7c6..3bbc2fa5a604 100755 Binary files a/hardfp/opt/vc/sbin/vcfiled and b/hardfp/opt/vc/sbin/vcfiled differ diff --git a/modules/3.6.11+/kernel/drivers/net/wireless/rtl8192cu/8192cu.ko b/modules/3.6.11+/kernel/drivers/net/wireless/rtl8192cu/8192cu.ko index 2f1681f7d5f8..b81b1d3f7271 100644 Binary files a/modules/3.6.11+/kernel/drivers/net/wireless/rtl8192cu/8192cu.ko and b/modules/3.6.11+/kernel/drivers/net/wireless/rtl8192cu/8192cu.ko differ diff --git a/modules/3.6.11+/kernel/drivers/usb/serial/cp210x.ko b/modules/3.6.11+/kernel/drivers/usb/serial/cp210x.ko index 7d31927c3b24..b35d09d7e394 100644 Binary files a/modules/3.6.11+/kernel/drivers/usb/serial/cp210x.ko and b/modules/3.6.11+/kernel/drivers/usb/serial/cp210x.ko differ diff --git a/modules/3.6.11+/modules.alias b/modules/3.6.11+/modules.alias index ca3b95ea3907..9275dcb2678a 100644 --- a/modules/3.6.11+/modules.alias +++ b/modules/3.6.11+/modules.alias @@ -697,6 +697,7 @@ alias usb:v07B8p8178d*dc*dsc*dp*ic*isc*ip*in* 8192cu alias usb:v2019pAB2Bd*dc*dsc*dp*ic*isc*ip*in* 8192cu alias usb:v7392p7822d*dc*dsc*dp*ic*isc*ip*in* 8192cu alias usb:v0586p341Fd*dc*dsc*dp*ic*isc*ip*in* 8192cu +alias usb:v2001p330Dd*dc*dsc*dp*ic*isc*ip*in* 8192cu alias usb:v2001p3309d*dc*dsc*dp*ic*isc*ip*in* 8192cu alias usb:v2001p330Ad*dc*dsc*dp*ic*isc*ip*in* 8192cu alias usb:v2001p3307d*dc*dsc*dp*ic*isc*ip*in* 8192cu @@ -1489,6 +1490,7 @@ alias usb:v10C4p0F91d*dc*dsc*dp*ic*isc*ip*in* cp210x alias usb:v10B5pAC70d*dc*dsc*dp*ic*isc*ip*in* cp210x alias usb:v10ABp10C5d*dc*dsc*dp*ic*isc*ip*in* cp210x alias usb:v10A6pAA26d*dc*dsc*dp*ic*isc*ip*in* cp210x +alias usb:v0FDEpCA05d*dc*dsc*dp*ic*isc*ip*in* cp210x alias usb:v0FCFp1006d*dc*dsc*dp*ic*isc*ip*in* cp210x alias usb:v0FCFp1004d*dc*dsc*dp*ic*isc*ip*in* cp210x alias usb:v0FCFp1003d*dc*dsc*dp*ic*isc*ip*in* cp210x diff --git a/modules/3.6.11+/modules.alias.bin b/modules/3.6.11+/modules.alias.bin index 48655d3a6a4e..a2552992d301 100644 Binary files a/modules/3.6.11+/modules.alias.bin and b/modules/3.6.11+/modules.alias.bin differ diff --git a/opt/vc/bin/tvservice b/opt/vc/bin/tvservice index 2b8c4f9cd6e8..6be0f99a0e45 100755 Binary files a/opt/vc/bin/tvservice and b/opt/vc/bin/tvservice differ diff --git a/opt/vc/bin/vcdbg b/opt/vc/bin/vcdbg index dcc702cbc3e8..8f84b8608ad9 100755 Binary files a/opt/vc/bin/vcdbg and b/opt/vc/bin/vcdbg differ diff --git a/opt/vc/bin/vchiq_test b/opt/vc/bin/vchiq_test index 29efa22ff113..67ba5ba594a8 100755 Binary files a/opt/vc/bin/vchiq_test and b/opt/vc/bin/vchiq_test differ diff --git a/opt/vc/include/interface/vcos/pthreads/vcos_platform.h b/opt/vc/include/interface/vcos/pthreads/vcos_platform.h index c6550a7ae29c..465abd297194 100644 --- a/opt/vc/include/interface/vcos/pthreads/vcos_platform.h +++ b/opt/vc/include/interface/vcos/pthreads/vcos_platform.h @@ -57,6 +57,7 @@ extern "C" { #include #include #include +#include #define VCOS_HAVE_RTOS 1 @@ -723,6 +724,11 @@ char *vcos_strdup(const char *str) typedef void (*VCOS_ISR_HANDLER_T)(VCOS_UNSIGNED vecnum); +#define VCOS_DL_LAZY RTLD_LAZY +#define VCOS_DL_NOW RTLD_NOW +#define VCOS_DL_LOCAL RTLD_LOCAL +#define VCOS_DL_GLOBAL RTLD_GLOBAL + #ifdef __cplusplus } #endif diff --git a/opt/vc/include/interface/vcos/vcos_dlfcn.h b/opt/vc/include/interface/vcos/vcos_dlfcn.h index 3a2ed240c41d..f017a9e7c8b2 100644 --- a/opt/vc/include/interface/vcos/vcos_dlfcn.h +++ b/opt/vc/include/interface/vcos/vcos_dlfcn.h @@ -39,9 +39,6 @@ VCOS - abstraction over dynamic library opening extern "C" { #endif -#define VCOS_DL_LAZY 1 -#define VCOS_DL_NOW 2 - /** * \file * @@ -51,7 +48,7 @@ extern "C" { /** Open a dynamic library. * * @param name name of the library - * @param mode Load lazily or immediately (VCOS_DL_LAZY, VCOS_DL_NOW). + * @param mode Load lazily or immediately (VCOS_DL_LAZY, VCOS_DL_NOW, VCOS_DL_LOCAL, VCOS_DL_GLOBAL). * * @return A handle for use in subsequent calls. */ diff --git a/opt/vc/lib/libEGL.so b/opt/vc/lib/libEGL.so index c3c9da50691d..cceb3f6dc53f 100644 Binary files a/opt/vc/lib/libEGL.so and b/opt/vc/lib/libEGL.so differ diff --git a/opt/vc/lib/libEGL_static.a b/opt/vc/lib/libEGL_static.a index d6626d929dfe..0042b1d5003a 100644 Binary files a/opt/vc/lib/libEGL_static.a and b/opt/vc/lib/libEGL_static.a differ diff --git a/opt/vc/lib/libGLESv1_CM.so b/opt/vc/lib/libGLESv1_CM.so index e808cd736221..2a9f8ad2b56c 100644 Binary files a/opt/vc/lib/libGLESv1_CM.so and b/opt/vc/lib/libGLESv1_CM.so differ diff --git a/opt/vc/lib/libGLESv2.so b/opt/vc/lib/libGLESv2.so index e808cd736221..2a9f8ad2b56c 100644 Binary files a/opt/vc/lib/libGLESv2.so and b/opt/vc/lib/libGLESv2.so differ diff --git a/opt/vc/lib/libGLESv2_static.a b/opt/vc/lib/libGLESv2_static.a index 5dcb6ace7e32..145f1129b929 100644 Binary files a/opt/vc/lib/libGLESv2_static.a and b/opt/vc/lib/libGLESv2_static.a differ diff --git a/opt/vc/lib/libWFC.so b/opt/vc/lib/libWFC.so index 2ea80cb0424c..e8f1c78382ab 100644 Binary files a/opt/vc/lib/libWFC.so and b/opt/vc/lib/libWFC.so differ diff --git a/opt/vc/lib/libbcm_host.so b/opt/vc/lib/libbcm_host.so index 5c304bd11b93..4a05f5c2b067 100644 Binary files a/opt/vc/lib/libbcm_host.so and b/opt/vc/lib/libbcm_host.so differ diff --git a/opt/vc/lib/libdebug_sym.so b/opt/vc/lib/libdebug_sym.so index df988776b8e7..0744e5aaad3e 100644 Binary files a/opt/vc/lib/libdebug_sym.so and b/opt/vc/lib/libdebug_sym.so differ diff --git a/opt/vc/lib/libkhrn_client.a b/opt/vc/lib/libkhrn_client.a index 3dca3eeab52a..6c677e6bfe17 100644 Binary files a/opt/vc/lib/libkhrn_client.a and b/opt/vc/lib/libkhrn_client.a differ diff --git a/opt/vc/lib/libkhrn_static.a b/opt/vc/lib/libkhrn_static.a index 9fe2f5904ccf..f36aadba92a6 100644 Binary files a/opt/vc/lib/libkhrn_static.a and b/opt/vc/lib/libkhrn_static.a differ diff --git a/opt/vc/lib/libmmal.so b/opt/vc/lib/libmmal.so index 4aca21787223..c0f6ffdd3fe2 100644 Binary files a/opt/vc/lib/libmmal.so and b/opt/vc/lib/libmmal.so differ diff --git a/opt/vc/lib/libmmal_vc_client.so b/opt/vc/lib/libmmal_vc_client.so index 051366f99129..81c9cfa4419d 100644 Binary files a/opt/vc/lib/libmmal_vc_client.so and b/opt/vc/lib/libmmal_vc_client.so differ diff --git a/opt/vc/lib/libopenmaxil.so b/opt/vc/lib/libopenmaxil.so index 3fc4f62b6a00..b10a1f0595f7 100644 Binary files a/opt/vc/lib/libopenmaxil.so and b/opt/vc/lib/libopenmaxil.so differ diff --git a/opt/vc/lib/libvcfiled_check.a b/opt/vc/lib/libvcfiled_check.a index cc6b7e6be787..91b558e7065f 100644 Binary files a/opt/vc/lib/libvcfiled_check.a and b/opt/vc/lib/libvcfiled_check.a differ diff --git a/opt/vc/lib/libvchiq_arm.so b/opt/vc/lib/libvchiq_arm.so index 21ef795d95e4..9c7bd3aac9d6 100644 Binary files a/opt/vc/lib/libvchiq_arm.so and b/opt/vc/lib/libvchiq_arm.so differ diff --git a/opt/vc/lib/libvchostif.a b/opt/vc/lib/libvchostif.a index 398c58335a3f..6eb02c5a4f8d 100644 Binary files a/opt/vc/lib/libvchostif.a and b/opt/vc/lib/libvchostif.a differ diff --git a/opt/vc/lib/libvcos.so b/opt/vc/lib/libvcos.so index bf7bbf2a3c59..3357a8a57ca6 100644 Binary files a/opt/vc/lib/libvcos.so and b/opt/vc/lib/libvcos.so differ diff --git a/opt/vc/lib/libvmcs_rpc_client.a b/opt/vc/lib/libvmcs_rpc_client.a index 5d7862a18bad..c493946e0343 100644 Binary files a/opt/vc/lib/libvmcs_rpc_client.a and b/opt/vc/lib/libvmcs_rpc_client.a differ diff --git a/opt/vc/sbin/vcfiled b/opt/vc/sbin/vcfiled index 480c299e225d..8314f1315701 100755 Binary files a/opt/vc/sbin/vcfiled and b/opt/vc/sbin/vcfiled differ