summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@kernel.org>2019-05-14 14:06:43 +0300
committerJosh Boyer <jwboyer@kernel.org>2019-05-14 14:06:43 +0300
commit711d3297bac870af42088a467459a0634c1970ca (patch)
tree7baedd8837a0d75e05d1a340f153cf302793339e
parent1f8ebdfc2634944cc70c1ca3b4f167e39a7109c1 (diff)
parente04cc56d0e6b6ff05924ff88fdba1a438ee7d3c8 (diff)
downloadlinux-firmware-711d3297bac870af42088a467459a0634c1970ca.tar.xz
Merge branch 'amlogic-vdec' of https://github.com/Elyotna/linux-firmware20190514
Signed-off-by: Josh Boyer <jwboyer@kernel.org>
-rw-r--r--LICENSE.amlogic_vdec15
-rw-r--r--WHENCE18
-rw-r--r--meson/vdec/g12a_h264.binbin0 -> 36864 bytes
-rw-r--r--meson/vdec/g12a_vp9.binbin0 -> 16384 bytes
-rw-r--r--meson/vdec/gxbb_h264.binbin0 -> 36864 bytes
-rw-r--r--meson/vdec/gxl_h263.binbin0 -> 16384 bytes
-rw-r--r--meson/vdec/gxl_h264.binbin0 -> 36864 bytes
-rw-r--r--meson/vdec/gxl_hevc.binbin0 -> 16384 bytes
-rw-r--r--meson/vdec/gxl_hevc_mmu.binbin0 -> 16384 bytes
-rw-r--r--meson/vdec/gxl_mjpeg.binbin0 -> 16384 bytes
-rw-r--r--meson/vdec/gxl_mpeg12.binbin0 -> 16384 bytes
-rw-r--r--meson/vdec/gxl_mpeg4_5.binbin0 -> 16384 bytes
-rw-r--r--meson/vdec/gxm_h264.binbin0 -> 36864 bytes
13 files changed, 33 insertions, 0 deletions
diff --git a/LICENSE.amlogic_vdec b/LICENSE.amlogic_vdec
new file mode 100644
index 0000000..ac48f20
--- /dev/null
+++ b/LICENSE.amlogic_vdec
@@ -0,0 +1,15 @@
+---------------------------------------------------------------------
+Amlogic Co., Inc. grants permission to use and redistribute
+aforementioned firmware files for the use with devices containing
+Amlogic chipsets, but not as part of the Linux kernel or in any other
+form which would require these files themselves to be covered by the
+terms of the GNU General Public License or the GNU Lesser General
+Public License.
+
+These firmware files are distributed in the hope that they will be
+useful, but are provided WITHOUT ANY WARRANTY, INCLUDING BUT NOT
+LIMITED TO IMPLIED WARRANTY OF MERCHANTABILITY OR FITNESS FOR A
+PARTICULAR PURPOSE.
+
+Amlogic Contact: Arden Jin <Arden.Jin@amlogic.com>
+---------------------------------------------------------------------
diff --git a/WHENCE b/WHENCE
index a59a638..32eca87 100644
--- a/WHENCE
+++ b/WHENCE
@@ -4408,3 +4408,21 @@ File: microchip/mscc_vsc8574_revb_int8051_29e8.bin
File: microchip/mscc_vsc8584_revb_int8051_fb48.bin
Licence: Redistributable. See LICENCE.microchip for details
+
+--------------------------------------------------------------------------
+
+Driver: meson-vdec - Amlogic video decoder
+
+File: meson/vdec/g12a_h264.bin
+File: meson/vdec/g12a_vp9.bin
+File: meson/vdec/gxbb_h264.bin
+File: meson/vdec/gxl_h263.bin
+File: meson/vdec/gxl_h264.bin
+File: meson/vdec/gxl_hevc.bin
+File: meson/vdec/gxl_hevc_mmu.bin
+File: meson/vdec/gxl_mjpeg.bin
+File: meson/vdec/gxl_mpeg12.bin
+File: meson/vdec/gxl_mpeg4_5.bin
+File: meson/vdec/gxm_h264.bin
+
+Licence: Redistributable. See LICENSE.amlogic_vdec for details.
diff --git a/meson/vdec/g12a_h264.bin b/meson/vdec/g12a_h264.bin
new file mode 100644
index 0000000..32635ed
--- /dev/null
+++ b/meson/vdec/g12a_h264.bin
Binary files differ
diff --git a/meson/vdec/g12a_vp9.bin b/meson/vdec/g12a_vp9.bin
new file mode 100644
index 0000000..94e1674
--- /dev/null
+++ b/meson/vdec/g12a_vp9.bin
Binary files differ
diff --git a/meson/vdec/gxbb_h264.bin b/meson/vdec/gxbb_h264.bin
new file mode 100644
index 0000000..7a7d29f
--- /dev/null
+++ b/meson/vdec/gxbb_h264.bin
Binary files differ
diff --git a/meson/vdec/gxl_h263.bin b/meson/vdec/gxl_h263.bin
new file mode 100644
index 0000000..fd6de0f
--- /dev/null
+++ b/meson/vdec/gxl_h263.bin
Binary files differ
diff --git a/meson/vdec/gxl_h264.bin b/meson/vdec/gxl_h264.bin
new file mode 100644
index 0000000..9468c65
--- /dev/null
+++ b/meson/vdec/gxl_h264.bin
Binary files differ
diff --git a/meson/vdec/gxl_hevc.bin b/meson/vdec/gxl_hevc.bin
new file mode 100644
index 0000000..a97a888
--- /dev/null
+++ b/meson/vdec/gxl_hevc.bin
Binary files differ
diff --git a/meson/vdec/gxl_hevc_mmu.bin b/meson/vdec/gxl_hevc_mmu.bin
new file mode 100644
index 0000000..e2ba474
--- /dev/null
+++ b/meson/vdec/gxl_hevc_mmu.bin
Binary files differ
diff --git a/meson/vdec/gxl_mjpeg.bin b/meson/vdec/gxl_mjpeg.bin
new file mode 100644
index 0000000..c365b0d
--- /dev/null
+++ b/meson/vdec/gxl_mjpeg.bin
Binary files differ
diff --git a/meson/vdec/gxl_mpeg12.bin b/meson/vdec/gxl_mpeg12.bin
new file mode 100644
index 0000000..65d0cac
--- /dev/null
+++ b/meson/vdec/gxl_mpeg12.bin
Binary files differ
diff --git a/meson/vdec/gxl_mpeg4_5.bin b/meson/vdec/gxl_mpeg4_5.bin
new file mode 100644
index 0000000..5c1023e
--- /dev/null
+++ b/meson/vdec/gxl_mpeg4_5.bin
Binary files differ
diff --git a/meson/vdec/gxm_h264.bin b/meson/vdec/gxm_h264.bin
new file mode 100644
index 0000000..4d73e17
--- /dev/null
+++ b/meson/vdec/gxm_h264.bin
Binary files differ