From e2452aacac4efefd57efd58503d08349e8f98c47 Mon Sep 17 00:00:00 2001
From: Igor Pecovnik <igor.pecovnik@gmail.com>
Date: Thu, 14 Apr 2016 18:11:04 +0200
Subject: [PATCH] Fix bugfixes for Odroid C2 building and fixed upstream patch

---
 config/boot-odroid-c2.ini                           |  2 +-
 extras/rtl8192cu.sh                                 |  2 +-
 .../odroidc2-default/packaging-odroid-c2.patch      | 13 +++++++++++++
 .../kernel/odroidc2-default/patch-3.14.65-66.patch  |  4 ++--
 4 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 patch/kernel/odroidc2-default/packaging-odroid-c2.patch

diff --git a/config/boot-odroid-c2.ini b/config/boot-odroid-c2.ini
index 62c93408c..c492fd867 100644
--- a/config/boot-odroid-c2.ini
+++ b/config/boot-odroid-c2.ini
@@ -82,7 +82,7 @@ setenv dtb_loadaddr "0x1000000"
 setenv initrd_loadaddr "0x13000000"
 
 fatload mmc 0:1 ${initrd_loadaddr} uInitrd
-fatload mmc 0:1 ${loadaddr} Image
+fatload mmc 0:1 ${loadaddr} zImage
 fatload mmc 0:1 ${dtb_loadaddr} dtb/meson64_odroidc2.dtb
 
 booti ${loadaddr} ${initrd_loadaddr} ${dtb_loadaddr}
\ No newline at end of file
diff --git a/extras/rtl8192cu.sh b/extras/rtl8192cu.sh
index e2a9bd530..f05646837 100644
--- a/extras/rtl8192cu.sh
+++ b/extras/rtl8192cu.sh
@@ -25,7 +25,7 @@ install_rtl8192cu()
 	#cp blacklist*.conf $CACHEDIR/sdcard/etc/modprobe.d/
 }
 
-if [[ $BRANCH == default ]]; then
+if [[ $BRANCH == default && $ARCHITECTURE == arm ]]; then
 	display_alert "Installing additional driver" "RT8192" "info"
 	install_rtl8192cu
 fi
diff --git a/patch/kernel/odroidc2-default/packaging-odroid-c2.patch b/patch/kernel/odroidc2-default/packaging-odroid-c2.patch
new file mode 100644
index 000000000..7d69fd8ed
--- /dev/null
+++ b/patch/kernel/odroidc2-default/packaging-odroid-c2.patch
@@ -0,0 +1,13 @@
+diff --git a/scripts/package/builddeb b/scripts/package/builddeb
+index 152d4d2..4455453 100644
+--- a/scripts/package/builddeb
++++ b/scripts/package/builddeb
+@@ -138,7 +168,7 @@ fi
+ if [ -e $KBUILD_IMAGE ]; then
+ 	cp $KBUILD_IMAGE "$tmpdir/$installed_image_path"
+ else
+-	cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path"
++	cp arch/$ARCH/boot/Image "$tmpdir/$installed_image_path"
+ fi
+ 
+ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then
\ No newline at end of file
diff --git a/patch/kernel/odroidc2-default/patch-3.14.65-66.patch b/patch/kernel/odroidc2-default/patch-3.14.65-66.patch
index 7abdb61a3..0311d8ae7 100644
--- a/patch/kernel/odroidc2-default/patch-3.14.65-66.patch
+++ b/patch/kernel/odroidc2-default/patch-3.14.65-66.patch
@@ -1832,15 +1832,15 @@ diff --git a/include/linux/fs.h b/include/linux/fs.h
 index 23b2a35d712e..42dd4c916781 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -2078,7 +2078,7 @@ extern long do_sys_open(int dfd, const char __user *filename, int flags,
+@@ -2090,7 +2090,7 @@ extern long do_sys_open(int dfd, const char __user *filename, int flags,
  extern struct file *file_open_name(struct filename *, int, umode_t);
  extern struct file *filp_open(const char *, int, umode_t);
  extern struct file *file_open_root(struct dentry *, struct vfsmount *,
 -				   const char *, int);
 +				   const char *, int, umode_t);
+ extern int vfs_open(const struct path *, struct file *, const struct cred *);
  extern struct file * dentry_open(const struct path *, int, const struct cred *);
  extern int filp_close(struct file *, fl_owner_t id);
- 
 diff --git a/include/linux/kernel.h b/include/linux/kernel.h
 index 196d1ea86df0..129438a741bb 100644
 --- a/include/linux/kernel.h