From 5d3c87ff85b701cabcdfe1d08421089c5f4db1eb Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 20 Oct 2019 16:43:28 +0300
Subject: [PATCH 1/3] Simplifiy list-versions-s3 helper script

---
 .../common/overlay/usr/libexec/list-versions-s3 | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/board/common/overlay/usr/libexec/list-versions-s3 b/board/common/overlay/usr/libexec/list-versions-s3
index 25d4964d90..359c07067d 100755
--- a/board/common/overlay/usr/libexec/list-versions-s3
+++ b/board/common/overlay/usr/libexec/list-versions-s3
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # expected final S3 URL: 
-#    https://s3.amazonaws.com/${bucket}/${path}/${version}/${os_short_name}-${board}-${version}.img.xz
+#    https://{bucket}.s3.amazonaws.com/${path}/${version}/${os_short_name}-${board}-${version}.img.xz
 
 if [ -z "$1" ]; then
     echo "Usage: $0 <bucket/path>" 1>&2
@@ -14,21 +14,21 @@ path=${bucket_path:${#bucket} + 1}
 
 opts="-s -S -f"
 test -n "${FW_USERNAME}" && opts+=" --user ${FW_USERNAME}:${FW_PASSWORD}"
-url=https://s3.amazonaws.com/${bucket}
+url="https://${bucket}.s3.amazonaws.com"
 
-xml_result=$(curl ${opts} ${url})
+xml_result=$(curl ${opts} "${url}?list-type=2&prefix=${path}")
 keys=$(echo "${xml_result}" | grep -oE '<Key>[^<]+<\/Key>' | sed 's/<Key>\(.*\)<\/Key>/\1/')
 dates=$(echo "${xml_result}" | grep -oE '<LastModified>[^<]+<\/LastModified>' | sed 's/<LastModified>\(.*\)<\/LastModified>/\1/')
 dates=(${dates})
-files=$(echo "${keys}" | grep "^${path}/" | sed "s,^${path}\/,," | sed '/^$/d')
+files=(${keys})
 
 i=0
-for file in ${files}; do
-    version=$(echo ${file} | cut -d '/' -f 1)
-    fname=$(echo ${file} | cut -d '/' -f 2)
+for file in ${files[*]}; do
+    version=$(echo ${file:${#path} + 1} | cut -d '/' -f 1)
+    fname=$(basename ${file})
     i=$((i + 1))
     if [[ -z "${fname}" ]]; then
-        continue  # version folder
+        continue
     fi
 
     prerelease=false
@@ -44,4 +44,3 @@ for file in ${files}; do
     
     echo "${version}|${prerelease}|${board}|${final_url}|${date}"
 done | sort -t '|' -k 5,3 -r
-

From 0486f6b846667f15bf3c08e66b178a7a6e2c3102 Mon Sep 17 00:00:00 2001
From: Joo Aun Saw <jasaw@dius.com.au>
Date: Tue, 22 Oct 2019 13:50:55 +1100
Subject: [PATCH 2/3] s5p_mfc_enc: silence failed to try output format message

---
 ...-mfc-enc-silence-failed-to-try-output-format.patch | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 linux/0001-s5p-mfc-enc-silence-failed-to-try-output-format.patch

diff --git a/linux/0001-s5p-mfc-enc-silence-failed-to-try-output-format.patch b/linux/0001-s5p-mfc-enc-silence-failed-to-try-output-format.patch
new file mode 100644
index 0000000000..bc17ef0035
--- /dev/null
+++ b/linux/0001-s5p-mfc-enc-silence-failed-to-try-output-format.patch
@@ -0,0 +1,11 @@
+diff -rupEbwBN linux-custom.org/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c linux-custom/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
+--- linux-custom.org/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c	2019-06-19 03:22:19.000000000 +1000
++++ linux-custom/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c	2019-10-22 10:51:38.006560436 +1100
+@@ -1067,7 +1066,6 @@ static int vidioc_try_fmt(struct file *f
+ 	} else if (f->type == V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE) {
+ 		fmt = find_format(f, MFC_FMT_RAW);
+ 		if (!fmt) {
+-			mfc_err("failed to try output format\n");
+ 			return -EINVAL;
+ 		}
+ 		if ((dev->variant->version_bit & fmt->versions) == 0) {

From 6f8ee982169460243328bd4285d2e182a79a3e4e Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Wed, 23 Oct 2019 21:53:40 +0300
Subject: [PATCH 3/3] Odroid XU4: move s5p-mfc-enc kernel patch to
 board/odroidxu4

---
 .../0001-s5p-mfc-enc-silence-failed-to-try-output-format.patch   | 0
 configs/odroidxu4_defconfig                                      | 1 +
 2 files changed, 1 insertion(+)
 rename {linux => board/odroidxu4}/0001-s5p-mfc-enc-silence-failed-to-try-output-format.patch (100%)

diff --git a/linux/0001-s5p-mfc-enc-silence-failed-to-try-output-format.patch b/board/odroidxu4/0001-s5p-mfc-enc-silence-failed-to-try-output-format.patch
similarity index 100%
rename from linux/0001-s5p-mfc-enc-silence-failed-to-try-output-format.patch
rename to board/odroidxu4/0001-s5p-mfc-enc-silence-failed-to-try-output-format.patch
diff --git a/configs/odroidxu4_defconfig b/configs/odroidxu4_defconfig
index 6f3808b498..e73879c400 100644
--- a/configs/odroidxu4_defconfig
+++ b/configs/odroidxu4_defconfig
@@ -13,6 +13,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/be592282a08a2493692448e365e46b52ac715b3f.tar.gz"
+BR2_LINUX_KERNEL_PATCH="board/odroidxu4/0001-s5p-mfc-enc-silence-failed-to-try-output-format.patch"
 BR2_LINUX_KERNEL_DEFCONFIG="odroidxu4"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INTREE_DTS_NAME="exynos5422-odroidxu4"