bump to linux-yocto 3.19 for the non-x86 BSPs
PATCH 1/1 bump to linux-yocto 3.19 for the non-x86 BSPs
Hi,
This patch series updates the kernel to 3.19 for the non-x86 BSPs. It includes two kernel patches, one patch for meta and one patch for meta-yocto-bsp layer. Boot test on beaglebone black, edgerouter and mpc8315 boards.
Thanks,
Kevin
Signature · 1 line
2.1.0
PATCH 1/1 meta; edgerouter: fix kernel config check errors
Fix the following kernel config check errors:
Value requested for CONFIG_HW_RANDOM_OCTEON not in final ".config" Requested value: "CONFIG_HW_RANDOM_OCTEON=y"
Actual value set: "CONFIG_HW_RANDOM_OCTEON=m"
Value requested for CONFIG_USB_OCTEON_EHCI not in final ".config" Requested value: "CONFIG_USB_OCTEON_EHCI=y"
Actual value set: ""
Value requested for CONFIG_USB_OCTEON_OHCI not in final ".config" Requested value: "CONFIG_USB_OCTEON_OHCI=y"
Actual value set: ""
--- meta/cfg/kernel-cache/bsp/edgerouter/edgerouter.cfg | 3 +++ 1 file changed, 3 insertions(+)
meta/cfg/kernel-cache/bsp/edgerouter/edgerouter.cfg +3 -0
@@ -20,6 +20,7 @@ CONFIG_PCI_MSI=y CONFIG_I2C=y CONFIG_I2C_OCTEON=y +CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_OCTEON=y #SPI
@@ -47,7 +48,9 @@ CONFIG_BCM87XX_PHY=y #USB CONFIG_USB=y CONFIG_OCTEON_USB=y +CONFIG_USB_EHCI_HCD=y CONFIG_USB_OCTEON_EHCI=y +CONFIG_USB_OHCI_HCD=y CONFIG_USB_OCTEON_OHCI=y CONFIG_USB_OCTEON2_COMMON=y
Signature · 1 line
2.1.0
PATCH 1/2 fs: aufs: fix a build error for archs which doesn't support MUTEX_SPIN_ON_OWNER
In reply to Kevin HaoFor struct mutex, the member "owner" only exist when either DEBUG_MUTEXES or MUTEX_SPIN_ON_OWNER is enabled. The SMP is a necessary condition, but not a sufficiency condition for MUTEX_SPIN_ON_OWNER. So we would get build error on arch such as mpis due to SMP is enabled and both DEBUG_MUTEXES and MUTEX_SPIN_ON_OWNER are disabled. Replace the SMP with MUTEX_SPIN_ON_OWNER to fix it.
--- fs/aufs/i_op.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/aufs/i_op.c +1 -1
@@ -441,7 +441,7 @@ out:void au_pin_hdir_set_owner (struct au_pin *p,struct task_struct *task) { -#if defined(CONFIG_DEBUG_MUTEXES ) || defined(CONFIG_SMP ) +#if defined(CONFIG_DEBUG_MUTEXES ) || defined(CONFIG_MUTEX_SPIN_ON_OWNER ) p->hdir->hi_inode->i_mutex.owner = task;#endif }
Signature · 1 line
2.1.0
PATCH 1/1 meta-yocto-bsp: bump to linux-yocto 3.19 for the non-x86 BSPs
In reply to Kevin HaoBoot test for all these boards.
--- meta-yocto-bsp/conf/machine/beaglebone.conf | 2 +- meta-yocto-bsp/conf/machine/edgerouter.conf | 2 +- meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf | 2 +- meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.19.bbappend | 9 +++++++++ 4 files changed, 12 insertions(+), 3 deletions(-)
meta-yocto-bsp/conf/machine/beaglebone.conf +1 -1
@@ -22,7 +22,7 @@ EXTRA_IMAGECMD_jffs2 = "-lnp " SERIAL_CONSOLE = "115200 ttyO0" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.14%" +PREFERRED_VERSION_linux-yocto ?= "3.19%" KERNEL_IMAGETYPE = "zImage" KERNEL_DEVICETREE = "am335x-bone.dtb am335x-boneblack.dtb"
meta-yocto-bsp/conf/machine/edgerouter.conf +1 -1
@@ -11,7 +11,7 @@ KERNEL_ALT_IMAGETYPE = "vmlinux.bin" KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment" PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" -PREFERRED_VERSION_linux-yocto ?= "3.14%" +PREFERRED_VERSION_linux-yocto ?= "3.19%" SERIAL_CONSOLE = "115200 ttyS0" USE_VT ?= "0"
meta-yocto-bsp/conf/machine/mpc8315e-rdb.conf +1 -1
@@ -14,7 +14,7 @@ SERIAL_CONSOLE = "115200 ttyS0" MACHINE_FEATURES = "keyboard pci ext2 ext3 serial" -PREFERRED_VERSION_linux-yocto ?= "3.14%" +PREFERRED_VERSION_linux-yocto ?= "3.19%" PREFERRED_PROVIDER_virtual/kernel = "linux-yocto" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.19.bbappend +9 -0
@@ -1,11 +1,20 @@ KBRANCH_genericx86 = "standard/common-pc" KBRANCH_genericx86-64 = "standard/common-pc-64/base" +KBRANCH_edgerouter = "standard/edgerouter" +KBRANCH_beaglebone = "standard/beaglebone" +KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb" KMACHINE_genericx86 ?= "common-pc" KMACHINE_genericx86-64 ?= "common-pc-64" SRCREV_machine_genericx86 ?= "0befa35f40997c90936047e57fbbdd7edbf7e525" SRCREV_machine_genericx86-64 ?= "0befa35f40997c90936047e57fbbdd7edbf7e525" +SRCREV_machine_edgerouter ?= "2a5e3b16afa1e599df55aa4c3341c66f317172c9" +SRCREV_machine_beaglebone ?= "2a5e3b16afa1e599df55aa4c3341c66f317172c9" +SRCREV_machine_mpc8315e-rdb ?= "2d5ac895707436a0d9afcbb96cd3b68a6e443771" COMPATIBLE_MACHINE_genericx86 = "genericx86" COMPATIBLE_MACHINE_genericx86-64 = "genericx86-64" +COMPATIBLE_MACHINE_edgerouter = "edgerouter" +COMPATIBLE_MACHINE_beaglebone = "beaglebone" +COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
Signature · 1 line
2.1.0
PATCH 2/2 fs: yaffs2: kill f_dentry uses
In reply to Kevin HaoThe macro f_dentry was already killed by commit 78d28e651f97 ("kill f_dentry macro"). So we should kill all the uses of this macro.
--- fs/yaffs2/yaffs_vfs.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
fs/yaffs2/yaffs_vfs.c +13 -13
@@ -274,7 +274,7 @@ static int yaffs_readpage_nolock(struct file *f, struct page *pg) (long long )pos, (unsigned)PAGE_CACHE_SIZE); - obj =yaffs_dentry_to_obj (f->f_dentry); + obj =yaffs_dentry_to_obj (f->f_path.dentry); dev = obj->my_dev;
@@ -472,7 +472,7 @@ static ssize_t yaffs_hold_space(struct file *f)int n_free_chunks; - obj =yaffs_dentry_to_obj (f->f_dentry); + obj =yaffs_dentry_to_obj (f->f_path.dentry); dev = obj->my_dev;
@@ -490,7 +490,7 @@ static void yaffs_release_space(struct file *f)struct yaffs_obj *obj;struct yaffs_dev *dev; - obj =yaffs_dentry_to_obj (f->f_dentry); + obj =yaffs_dentry_to_obj (f->f_path.dentry); dev = obj->my_dev;
@@ -582,7 +582,7 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,struct inode *inode;struct yaffs_dev *dev; - obj =yaffs_dentry_to_obj (f->f_dentry); + obj =yaffs_dentry_to_obj (f->f_path.dentry);if (!obj) { yaffs_trace(YAFFS_TRACE_OS,
@@ -594,7 +594,7 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n,yaffs_gross_lock (dev); - inode = f->f_dentry->d_inode; + inode = f->f_path.dentry->d_inode;if (!S_ISBLK (inode->i_mode) && f->f_flags &O_APPEND ) ipos = inode->i_size;
@@ -745,7 +745,7 @@ static int yaffs_file_flush(struct file *file, fl_owner_t id) static int yaffs_file_flush(struct file *file)#endif { -struct yaffs_obj *obj =yaffs_dentry_to_obj (file->f_dentry); +struct yaffs_obj *obj =yaffs_dentry_to_obj (file->f_path.dentry);struct yaffs_dev *dev = obj->my_dev;
@@ -1712,14 +1712,14 @@ static int yaffs_readdir(struct file *file, struct dir_context *ctx)struct yaffs_obj *obj;struct yaffs_dev *dev;struct yaffs_search_context *sc; -struct inode *inode = file->f_dentry->d_inode; +struct inode *inode = file->f_path.dentry->d_inode;unsigned long offset, curoffs;struct yaffs_obj *l;int ret_val =0 ;char name[YAFFS_MAX_NAME_LENGTH +1 ]; - obj =yaffs_dentry_to_obj (file->f_dentry); + obj =yaffs_dentry_to_obj (file->f_path.dentry); dev = obj->my_dev;yaffs_gross_lock (dev);
@@ -1753,7 +1753,7 @@ static int yaffs_readdir(struct file *file, struct dir_context *ctx)if (offset ==1 ) {yaffs_trace (YAFFS_TRACE_OS ,"yaffs_readdir: entry .. ino %d" , - (int )file->f_dentry->d_parent->d_inode->i_ino); + (int )file->f_path.dentry->d_parent->d_inode->i_ino);yaffs_gross_unlock (dev);if (!dir_emit_dotdot (file, ctx)) {yaffs_gross_lock (dev);
@@ -1815,14 +1815,14 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)struct yaffs_obj *obj;struct yaffs_dev *dev;struct yaffs_search_context *sc; -struct inode *inode = f->f_dentry->d_inode; +struct inode *inode = f->f_path.dentry->d_inode;unsigned long offset, curoffs;struct yaffs_obj *l;int ret_val =0 ;char name[YAFFS_MAX_NAME_LENGTH +1 ]; - obj =yaffs_dentry_to_obj (f->f_dentry); + obj =yaffs_dentry_to_obj (f->f_path.dentry); dev = obj->my_dev;yaffs_gross_lock (dev);
@@ -1856,10 +1856,10 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir)if (offset ==1 ) {yaffs_trace (YAFFS_TRACE_OS ,"yaffs_readdir: entry .. ino %d" , - (int )f->f_dentry->d_parent->d_inode->i_ino); + (int )f->f_path.dentry->d_parent->d_inode->i_ino);yaffs_gross_unlock (dev);if (filldir (dirent,".." ,2 , offset, - f->f_dentry->d_parent->d_inode->i_ino, + f->f_path.dentry->d_parent->d_inode->i_ino,DT_DIR ) <0 ) {yaffs_gross_lock (dev); goto out;
Signature · 1 line
2.1.0
Quoted 6 lines · Kevin Hao
Hi,
This patch series updates the kernel to 3.19 for the non-x86 BSPs. It includes two kernel patches, one patch for meta and one patch for meta-yocto-bsp layer. Boot test on beaglebone black, edgerouter and mpc8315 boards.
Thanks Kevin.
I was on the road last week, but I've staged these changes and will send them out Monday.
Bruce
Quoted 3 lines
Thanks,
Kevin