Merge branch 'v1.1.4' of https://github.com/ruiwang-mtk/linux_fw_vpu

Signed-off-by: Josh Boyer <jwboyer@kernel.org>
2020-03-02 07:57:27 -05:00 · 2020-03-02 07:57:27 -05:00 · 6f50efe0da
parent efcfa03ae6 a8a18d1ce5
commit 6f50efe0da
5 changed files with 4 additions and 2 deletions
--- a/6
+++ b/6
@ -4450,8 +4450,10 @@ Licence: Redistributable. See LICENCE.Marvell for details.

 Driver: mtk-vpu - Mediatek VPU video processing unit driver

-File: vpu_d.bin
-File: vpu_p.bin
+File: mediatek/mt8173/vpu_d.bin
+File: mediatek/mt8173/vpu_p.bin
+Link: vpu_d.bin -> mediatek/mt8173/vpu_d.bin
+Link: vpu_p.bin -> mediatek/mt8173/vpu_p.bin

 Licence: Redistributable.

--- a/mediatek/mt8173/vpu_d.bin
+++ b/mediatek/mt8173/vpu_d.bin
--- a/mediatek/mt8173/vpu_p.bin
+++ b/mediatek/mt8173/vpu_p.bin
--- a/vpu_d.bin
+++ b/vpu_d.bin
--- a/vpu_d.bin
+++ b/vpu_d.bin
@ -0,0 +1 @@
+mediatek/mt8173/vpu_d.bin
--- a/vpu_p.bin
+++ b/vpu_p.bin
--- a/vpu_p.bin
+++ b/vpu_p.bin
@ -0,0 +1 @@
+mediatek/mt8173/vpu_p.bin