Fix bugfixes for Odroid C2 building and fixed upstream patch

This commit is contained in:
Igor Pecovnik 2016-04-14 18:11:04 +02:00
parent 223808eb5d
commit e2452aacac
4 changed files with 17 additions and 4 deletions

View file

@ -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}

View file

@ -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

View file

@ -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

View file

@ -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