kernel: pinctrl-bcm2835: Fix interrupt handling for GPIOs 28-31 and 4…

…6-53 See: raspberrypi/linux@11f2a1f kernel: perf: Add support for performance counter interrupt and enable in DT See: https://perf.wiki.kernel.org/index.php/Tutorial firmware: vdec3: preparation work for MVC firmware: OV5647: Correct line lengths for 25MHz oscillator See: http://www.raspberrypi.org/forums/viewtopic.php?f=43&t=99351 firmware: Tuner: Enable video stabilisation See: http://www.raspberrypi.org/forums/viewtopic.php?f=43&t=89177 firmware: Annotate: Add control of text size, colour, bg colour, and handle CR See: http://www.raspberrypi.org/forums/viewtopic.php?f=43&t=97929 userland: Add vcmailbox tool for issuing mailbox commands from command line
raspberrypi · Feb 26, 2015 · 033a916 · 033a916 · clivem · Feb 26, 2015
1 parent 1fd01f6
commit 033a916
Show file tree

Hide file tree

Showing 64 changed files with 71,729 additions and 71,635 deletions.
diff --git a/boot/bcm2708-rpi-b-plus.dtb b/boot/bcm2708-rpi-b-plus.dtb
diff --git a/boot/bcm2708-rpi-b.dtb b/boot/bcm2708-rpi-b.dtb
diff --git a/boot/bcm2709-rpi-2-b.dtb b/boot/bcm2709-rpi-2-b.dtb
diff --git a/boot/fixup.dat b/boot/fixup.dat
diff --git a/boot/fixup_cd.dat b/boot/fixup_cd.dat
diff --git a/boot/fixup_x.dat b/boot/fixup_x.dat
diff --git a/boot/kernel.img b/boot/kernel.img
diff --git a/boot/kernel7.img b/boot/kernel7.img
diff --git a/boot/start.elf b/boot/start.elf
diff --git a/boot/start_cd.elf b/boot/start_cd.elf
diff --git a/boot/start_x.elf b/boot/start_x.elf
diff --git a/extra/System.map b/extra/System.map
diff --git a/extra/System7.map b/extra/System7.map
diff --git a/extra/git_hash b/extra/git_hash
@@ -1 +1 @@
-2192c246bb3f8050f15744f39c06763cd5bbd97c
+1f58c41a5aba262958c2869263e6fdcaa0aa3c00
diff --git a/extra/uname_string b/extra/uname_string
@@ -1 +1 @@
-Linux version 3.18.7+ (dc4@dc4-XPS13-9333) (gcc version 4.8.3 20140303 (prerelease) (crosstool-NG linaro-1.13.1+bzr2650 - Linaro GCC 2014.03) ) #758 PREEMPT Mon Feb 23 19:27:03 GMT 2015
+Linux version 3.18.7+ (dc4@dc4-XPS13-9333) (gcc version 4.8.3 20140303 (prerelease) (crosstool-NG linaro-1.13.1+bzr2650 - Linaro GCC 2014.03) ) #759 PREEMPT Thu Feb 26 15:50:00 GMT 2015
diff --git a/extra/uname_string7 b/extra/uname_string7
@@ -1 +1 @@
-Linux version 3.18.7-v7+ (dc4@dc4-XPS13-9333) (gcc version 4.8.3 20140303 (prerelease) (crosstool-NG linaro-1.13.1+bzr2650 - Linaro GCC 2014.03) ) #758 SMP PREEMPT Mon Feb 23 19:52:56 GMT 2015
+Linux version 3.18.7-v7+ (dc4@dc4-XPS13-9333) (gcc version 4.8.3 20140303 (prerelease) (crosstool-NG linaro-1.13.1+bzr2650 - Linaro GCC 2014.03) ) #759 SMP PREEMPT Thu Feb 26 15:53:40 GMT 2015
diff --git a/hardfp/opt/vc/bin/mmal_vc_diag b/hardfp/opt/vc/bin/mmal_vc_diag
diff --git a/hardfp/opt/vc/bin/raspistill b/hardfp/opt/vc/bin/raspistill
diff --git a/hardfp/opt/vc/bin/raspivid b/hardfp/opt/vc/bin/raspivid
diff --git a/hardfp/opt/vc/bin/raspividyuv b/hardfp/opt/vc/bin/raspividyuv
diff --git a/hardfp/opt/vc/bin/raspiyuv b/hardfp/opt/vc/bin/raspiyuv
diff --git a/hardfp/opt/vc/bin/vcdbg b/hardfp/opt/vc/bin/vcdbg
diff --git a/hardfp/opt/vc/bin/vcmailbox b/hardfp/opt/vc/bin/vcmailbox
diff --git a/hardfp/opt/vc/include/IL/OMX_Broadcom.h b/hardfp/opt/vc/include/IL/OMX_Broadcom.h
@@ -2370,7 +2370,17 @@ typedef struct OMX_CONFIG_BRCMANNOTATETYPE {
    OMX_BOOL bShowCaf;
    OMX_BOOL bShowMotion;
    OMX_BOOL bShowFrameNum;
-   OMX_BOOL bBlackBackground;
+   OMX_BOOL bEnableBackground;
+   OMX_BOOL bCustomBackgroundColour;
+   OMX_U8 nBackgroundY;
+   OMX_U8 nBackgroundU;
+   OMX_U8 nBackgroundV;
+   OMX_U8 dummy1;
+   OMX_BOOL bCustomTextColour;
+   OMX_U8 nTextY;
+   OMX_U8 nTextU;
+   OMX_U8 nTextV;
+   OMX_U8 nTextSize;   /**< Text size: 6-150 pixels */
    OMX_U8 sText[OMX_BRCM_MAXANNOTATETEXTLEN];
 } OMX_CONFIG_BRCMANNOTATETYPE;
 

diff --git a/hardfp/opt/vc/include/interface/mmal/mmal_parameters_camera.h b/hardfp/opt/vc/include/interface/mmal/mmal_parameters_camera.h
@@ -736,6 +736,32 @@ typedef struct MMAL_PARAMETER_CAMERA_ANNOTATE_V2_T
    char text[MMAL_CAMERA_ANNOTATE_MAX_TEXT_LEN_V2];
 } MMAL_PARAMETER_CAMERA_ANNOTATE_V2_T;
 
+#define MMAL_CAMERA_ANNOTATE_MAX_TEXT_LEN_V3 256
+typedef struct MMAL_PARAMETER_CAMERA_ANNOTATE_V3_T
+{
+   MMAL_PARAMETER_HEADER_T hdr;
+
+   MMAL_BOOL_T enable;
+   MMAL_BOOL_T show_shutter;
+   MMAL_BOOL_T show_analog_gain;
+   MMAL_BOOL_T show_lens;
+   MMAL_BOOL_T show_caf;
+   MMAL_BOOL_T show_motion;
+   MMAL_BOOL_T show_frame_num;
+   MMAL_BOOL_T enable_text_background;
+   MMAL_BOOL_T custom_background_colour;
+   uint8_t     custom_background_Y;
+   uint8_t     custom_background_U;
+   uint8_t     custom_background_V;
+   uint8_t     dummy1;
+   MMAL_BOOL_T custom_text_colour;
+   uint8_t     custom_text_Y;
+   uint8_t     custom_text_U;
+   uint8_t     custom_text_V;
+   uint8_t     text_size;
+   char text[MMAL_CAMERA_ANNOTATE_MAX_TEXT_LEN_V3];
+} MMAL_PARAMETER_CAMERA_ANNOTATE_V3_T;
+
 typedef enum MMAL_STEREOSCOPIC_MODE_T {
    MMAL_STEREOSCOPIC_MODE_NONE = 0,
    MMAL_STEREOSCOPIC_MODE_SIDE_BY_SIDE = 1,

diff --git a/hardfp/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_Broadcom.h b/hardfp/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_Broadcom.h
@@ -2370,7 +2370,17 @@ typedef struct OMX_CONFIG_BRCMANNOTATETYPE {
    OMX_BOOL bShowCaf;
    OMX_BOOL bShowMotion;
    OMX_BOOL bShowFrameNum;
-   OMX_BOOL bBlackBackground;
+   OMX_BOOL bEnableBackground;
+   OMX_BOOL bCustomBackgroundColour;
+   OMX_U8 nBackgroundY;
+   OMX_U8 nBackgroundU;
+   OMX_U8 nBackgroundV;
+   OMX_U8 dummy1;
+   OMX_BOOL bCustomTextColour;
+   OMX_U8 nTextY;
+   OMX_U8 nTextU;
+   OMX_U8 nTextV;
+   OMX_U8 nTextSize;   /**< Text size: 6-150 pixels */
    OMX_U8 sText[OMX_BRCM_MAXANNOTATETEXTLEN];
 } OMX_CONFIG_BRCMANNOTATETYPE;
 

diff --git a/hardfp/opt/vc/lib/libEGL_static.a b/hardfp/opt/vc/lib/libEGL_static.a
diff --git a/hardfp/opt/vc/lib/libGLESv2_static.a b/hardfp/opt/vc/lib/libGLESv2_static.a
diff --git a/hardfp/opt/vc/lib/libdebug_sym_static.a b/hardfp/opt/vc/lib/libdebug_sym_static.a
diff --git a/hardfp/opt/vc/lib/libkhrn_client.a b/hardfp/opt/vc/lib/libkhrn_client.a
diff --git a/hardfp/opt/vc/lib/libkhrn_static.a b/hardfp/opt/vc/lib/libkhrn_static.a
diff --git a/hardfp/opt/vc/lib/libmmal.so b/hardfp/opt/vc/lib/libmmal.so
diff --git a/hardfp/opt/vc/lib/libmmal_components.so b/hardfp/opt/vc/lib/libmmal_components.so
diff --git a/hardfp/opt/vc/lib/libmmal_core.so b/hardfp/opt/vc/lib/libmmal_core.so
diff --git a/hardfp/opt/vc/lib/libmmal_util.so b/hardfp/opt/vc/lib/libmmal_util.so
diff --git a/hardfp/opt/vc/lib/libmmal_vc_client.so b/hardfp/opt/vc/lib/libmmal_vc_client.so
diff --git a/hardfp/opt/vc/lib/libvcfiled_check.a b/hardfp/opt/vc/lib/libvcfiled_check.a
diff --git a/hardfp/opt/vc/lib/libvchostif.a b/hardfp/opt/vc/lib/libvchostif.a
diff --git a/hardfp/opt/vc/lib/libvcilcs.a b/hardfp/opt/vc/lib/libvcilcs.a
diff --git a/hardfp/opt/vc/lib/libvmcs_rpc_client.a b/hardfp/opt/vc/lib/libvmcs_rpc_client.a
diff --git a/opt/vc/bin/mmal_vc_diag b/opt/vc/bin/mmal_vc_diag
diff --git a/opt/vc/bin/raspistill b/opt/vc/bin/raspistill
diff --git a/opt/vc/bin/raspivid b/opt/vc/bin/raspivid
diff --git a/opt/vc/bin/raspividyuv b/opt/vc/bin/raspividyuv
diff --git a/opt/vc/bin/raspiyuv b/opt/vc/bin/raspiyuv
diff --git a/opt/vc/bin/vcdbg b/opt/vc/bin/vcdbg
diff --git a/opt/vc/bin/vcmailbox b/opt/vc/bin/vcmailbox
diff --git a/opt/vc/include/IL/OMX_Broadcom.h b/opt/vc/include/IL/OMX_Broadcom.h
@@ -2370,7 +2370,17 @@ typedef struct OMX_CONFIG_BRCMANNOTATETYPE {
    OMX_BOOL bShowCaf;
    OMX_BOOL bShowMotion;
    OMX_BOOL bShowFrameNum;
-   OMX_BOOL bBlackBackground;
+   OMX_BOOL bEnableBackground;
+   OMX_BOOL bCustomBackgroundColour;
+   OMX_U8 nBackgroundY;
+   OMX_U8 nBackgroundU;
+   OMX_U8 nBackgroundV;
+   OMX_U8 dummy1;
+   OMX_BOOL bCustomTextColour;
+   OMX_U8 nTextY;
+   OMX_U8 nTextU;
+   OMX_U8 nTextV;
+   OMX_U8 nTextSize;   /**< Text size: 6-150 pixels */
    OMX_U8 sText[OMX_BRCM_MAXANNOTATETEXTLEN];
 } OMX_CONFIG_BRCMANNOTATETYPE;
 

diff --git a/opt/vc/include/interface/mmal/mmal_parameters_camera.h b/opt/vc/include/interface/mmal/mmal_parameters_camera.h
@@ -736,6 +736,32 @@ typedef struct MMAL_PARAMETER_CAMERA_ANNOTATE_V2_T
    char text[MMAL_CAMERA_ANNOTATE_MAX_TEXT_LEN_V2];
 } MMAL_PARAMETER_CAMERA_ANNOTATE_V2_T;
 
+#define MMAL_CAMERA_ANNOTATE_MAX_TEXT_LEN_V3 256
+typedef struct MMAL_PARAMETER_CAMERA_ANNOTATE_V3_T
+{
+   MMAL_PARAMETER_HEADER_T hdr;
+
+   MMAL_BOOL_T enable;
+   MMAL_BOOL_T show_shutter;
+   MMAL_BOOL_T show_analog_gain;
+   MMAL_BOOL_T show_lens;
+   MMAL_BOOL_T show_caf;
+   MMAL_BOOL_T show_motion;
+   MMAL_BOOL_T show_frame_num;
+   MMAL_BOOL_T enable_text_background;
+   MMAL_BOOL_T custom_background_colour;
+   uint8_t     custom_background_Y;
+   uint8_t     custom_background_U;
+   uint8_t     custom_background_V;
+   uint8_t     dummy1;
+   MMAL_BOOL_T custom_text_colour;
+   uint8_t     custom_text_Y;
+   uint8_t     custom_text_U;
+   uint8_t     custom_text_V;
+   uint8_t     text_size;
+   char text[MMAL_CAMERA_ANNOTATE_MAX_TEXT_LEN_V3];
+} MMAL_PARAMETER_CAMERA_ANNOTATE_V3_T;
+
 typedef enum MMAL_STEREOSCOPIC_MODE_T {
    MMAL_STEREOSCOPIC_MODE_NONE = 0,
    MMAL_STEREOSCOPIC_MODE_SIDE_BY_SIDE = 1,

diff --git a/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_Broadcom.h b/opt/vc/include/interface/vmcs_host/khronos/IL/OMX_Broadcom.h
@@ -2370,7 +2370,17 @@ typedef struct OMX_CONFIG_BRCMANNOTATETYPE {
    OMX_BOOL bShowCaf;
    OMX_BOOL bShowMotion;
    OMX_BOOL bShowFrameNum;
-   OMX_BOOL bBlackBackground;
+   OMX_BOOL bEnableBackground;
+   OMX_BOOL bCustomBackgroundColour;
+   OMX_U8 nBackgroundY;
+   OMX_U8 nBackgroundU;
+   OMX_U8 nBackgroundV;
+   OMX_U8 dummy1;
+   OMX_BOOL bCustomTextColour;
+   OMX_U8 nTextY;
+   OMX_U8 nTextU;
+   OMX_U8 nTextV;
+   OMX_U8 nTextSize;   /**< Text size: 6-150 pixels */
    OMX_U8 sText[OMX_BRCM_MAXANNOTATETEXTLEN];
 } OMX_CONFIG_BRCMANNOTATETYPE;
 

diff --git a/opt/vc/lib/libEGL_static.a b/opt/vc/lib/libEGL_static.a
diff --git a/opt/vc/lib/libGLESv2_static.a b/opt/vc/lib/libGLESv2_static.a
diff --git a/opt/vc/lib/libdebug_sym_static.a b/opt/vc/lib/libdebug_sym_static.a
diff --git a/opt/vc/lib/libkhrn_client.a b/opt/vc/lib/libkhrn_client.a
diff --git a/opt/vc/lib/libkhrn_static.a b/opt/vc/lib/libkhrn_static.a
diff --git a/opt/vc/lib/libmmal.so b/opt/vc/lib/libmmal.so
diff --git a/opt/vc/lib/libmmal_components.so b/opt/vc/lib/libmmal_components.so
diff --git a/opt/vc/lib/libmmal_core.so b/opt/vc/lib/libmmal_core.so
diff --git a/opt/vc/lib/libmmal_util.so b/opt/vc/lib/libmmal_util.so
diff --git a/opt/vc/lib/libmmal_vc_client.so b/opt/vc/lib/libmmal_vc_client.so
diff --git a/opt/vc/lib/libvcfiled_check.a b/opt/vc/lib/libvcfiled_check.a
diff --git a/opt/vc/lib/libvchostif.a b/opt/vc/lib/libvchostif.a
diff --git a/opt/vc/lib/libvcilcs.a b/opt/vc/lib/libvcilcs.a
diff --git a/opt/vc/lib/libvmcs_rpc_client.a b/opt/vc/lib/libvmcs_rpc_client.a