Updating to the latest korg -stable update for the 3.10 series. Minor
merge conflict resolution was done with the standard/ltsi and
standard/preempt-rt branches.
(From OE-Core rev: a87bf5d3d435d333f5ee9d15b8c641b03ff4bb9c)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating to the latest 3.10 -korg stable update. We also bring in a meta
change for the valley island IO configuration.
(From OE-Core rev: 22d5ac7e1fc096dc11c766eda91c9e131398c6c5)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the SRCREVs for the following fix:
8250/8250_dw: fix compile failure due to stable/Yocto conflict
As of merge 60a9d9fc565e4503dbb8705803e83d906afc4ad2, "Merge
tag 'v3.10.48' into standard/base" the 8250_dw.c fails to
compile due to an undeclared variable.
This happens because stable brought in:
-------------------------
commit 6d5e79331417886196cb3a733bdb6645ba85bc42
Author: Tim Kryger <tim.kryger@linaro.org>
Date: Tue Oct 1 10:18:08 2013 -0700
serial: 8250_dw: Improve unwritable LCR workaround
commit c49436b657d0a56a6ad90d14a7c3041add7cf64d upstream.
[...]
[wangnan: backport to 3.10.43:
- adjust context
- remove unneeded local var]
Signed-off-by: Wang Nan <wangnan0@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
------------------------
...which deletes the p->private_data declaration since it became
unused at that point, however in Yocto, we also have this:
-----------------------
commit 0e02b050c3cafbcbf9952125089a27e02d6ecea9
Author: David Daney <david.daney@cavium.com>
Date: Wed Jun 19 20:37:27 2013 +0000
tty/8250_dw: Add support for OCTEON UARTS.
[...]
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
(cherry picked from commit d5f1af7ece96cf52e0b110c72210ac15c2f65438)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
-----------------------
...which _adds_ another user of the p->private_data.
Here we restore the declaration in order that 8250_dw compiles.
Signed-off-by: Ong Boon Leong <boon.leong.ong@intel.com>
[PG: add root cause info to commit log.]
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
(From OE-Core rev: 4b4d1f38ea54ef8545e726ac9e181da08a2bad05)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The 3.10 kernel needed a refresh to the latest -stable and -rt releases.
(From OE-Core rev: c7360e9e72f06dab2617e16ae546f4d8e5262fa1)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the topic branch that is used for valleyisland-io merges.
(From OE-Core rev: 4d804dc8d683024ef2a0a07200492f458f52b535)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In order to make KBRANCH assignments more flexible and easy to override the
default in each recipe as changed to a conditional assignment. But the
common include file, sets its own branch default to master.
This results in the recipes not overriding KBRANCH and master always being
used.
By putting the include after the default assignment, we now get the proper
default branch.
(From OE-Core rev: ef48de6a4c1454c6f6e2de8636277b374ee44b50)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
KBRANCH_DEFAULT is no longer used, so we can remove it from all
recipes (and it won't be missed).
(From OE-Core rev: e631fc989b08873f559c5927117301294f04298c)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the 3.10 SRCREVs to pick up 3.10.35 and a LTSI cherry pick that
fixes a boot issue with the emenlow.
(From OE-Core rev: f0990363aaeb3f8f7a8e02fc2acb0af2171e4eba)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Andrea Adami reported the following build failure:
.../drm/drm_mm.h:105:2: error: implicit declaration of function
'BUG_ON' [-Werror=implicit-function-declaration]
| BUG_ON(!hole_node->hole_follows);
| ^
| CC drivers/pci/setup-res.o
| CC drivers/gpu/drm/i915/i915_drv.o
| cc1: some warnings being treated as errors
| make[6]: *** [drivers/gpu/drm/ttm/ttm_agp_backend.o] Error 1
| make[5]: *** [drivers/gpu/drm/ttm] Error 2
Cherry picking mainline commit 86e81f0e6 [drm/mm: include required headers in drm_mm.h]
fixes the build problems.
cc: Andrea Adami <andrea.adami@gmail.com>
(From OE-Core rev: 42c0eba4fac6b8bd28b58ec04574d04b0ab0c457)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Bumping the meta branch SRCREV for the following two commits:
df3aa753c882 intel-common: Add media-all to the standard builds
4b0d57269dae intel-common: Add mohonpeak BSP
(From OE-Core rev: 821b1c03db3793609e3ae564358de10e23591604)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the 3.10 meta SRCREV to include the valleyisland IO .scc and
configuration files.
(From OE-Core rev: 5adccadee00ac4408d3b3d4e6a0b7ee7c84cba97)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Importing the following two meta data changes for EFI configuration:
284e9589436a meta: efi.cfg/efi-ext.cfg: add EFIVAR_FS to default efi fragment
0a8c4971e2d9 meta: update efi config fragment to include EFI_STUB by default
(From OE-Core rev: ec6ff275ba44ec183c00910f47e5b8916e58ab14)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Importing the following configuration changes to support the latest intel
common BSPs:
6e0e756d5137 intel-common: Remove GMA500 support
226c3b7a2b82 intel-core*: Add baytrail soc support
25df7acf2cc4 baytrail: Add feature/soc/baytrail
8715856ab617 meta: input: add CONFIG_INPUT dependency
(From OE-Core rev: 88d2bb9c5959a9b1e744bb517c26a322cd537023)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The initial merge of the LTSI 3.10 content was missing the minnow-io feature.
This has now been added to standard/ltsi and merged to all branches in the
tree. We also update the meta branch to ensure that the existing feature
will not attempt to apply patches to the tree, since they have now been
integrated.
(From OE-Core rev: 8569e2488e45fc7cabbdafe240ca404b2b2e8519)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the 3.10 kernel SRCREVs to integrate the v3.10.27, 27 and 28 -stable
releases.
(From OE-Core rev: 91fb7cfaeb8ea1c05a15a0be8a56ac50b95fd6e4)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The introduction of LTSI has exposed a missing dependency on cpufreq
being enabled. To fix the build, we enable power management in the
32 bit BSP, which aligns it with 64 bit.
(From OE-Core rev: e859ebf08e73091640bd4d7329bbbe44270c4bf0)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the SRCREVs of the 3.10 tree to reflect the integration of
of commit 68054859 from:
git://git.linuxfoundation.org/ltsi-kernegit://git.linuxfoundation.org/ltsi-kernel.git
Build and boot tested on all qemu architectures.
(From OE-Core rev: 41a6b620f6e00d9222989058b3620cadc940ac21)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the 3.10 tree to the 3.10.25 korg -stable release.
(From OE-Core rev: 85ec7e0bb1306b3ac3506627a3aa04a42c0ec180)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the meta SRCREV to import the following changes:
d9cd83c0292b remove old MEDIA config fragments
06b76256d7e2 common-pc-standard.scc: Enable USB webcam support
acb8b43837d8 common-pc-64.scc: update as per changes in the media config fragments
5513fd2ad72a minnow-standard.scc: Enable media features
172ba799bedc media-all.scc: A feature including all the media features
1a7e1d3a292e media-platform: A feature for platform media devices
03c48dacbb9a media-dvb-frontends : A feature for Digital Video Broadcast Devices
59b92b9d6c72 media-usb-tv: A feature for USB TV media adapters
5ec0709b1fed media-tuners: A feature for media tuner devices
356dc83e39f3 media-rc: A feature for remote control media devices
89d96cf9d574 media-radio: A feature for AM/FM radio devices
3dd2ebeaf49b media-pci-capture: A feature for PCI media capture devices
9ee0e95bfc52 media-i2c: A feature for I2C media devices
28976f4a3e27 media-usb-webcams: A feature for USB media devices
f8206f4e00b1 media: A feature for media infrastructure
08bfb248a17f standard.scc: Add firmware loading feature
e567a3d53593 firmware: A feature for firmware loading support
(From OE-Core rev: f4b00c4ddf1efb2a728b7a08b542c9c7254c787f)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the 3.10 SRCREVs for the following fixes:
f47ea28 bridge: enable EBTABLES
a9ec82e e1000: prevent oops when adapter is being closed and reset simultaneously
a4e1bd7 Revert "arm: add dummy swizzle for versatile with qemu"
(From OE-Core rev: 20139a693677c23324c89c963735f3b8c18eeb84)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the linux-yocto-3.10 SRCREVs to the latest korg -stable
release.
(From OE-Core rev: 1da738722c9f81260dfbada6a97a21eb812d20a1)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the meta branch SRCREV to update the USB configuration:
The Beagleboard needs the USB PHY drivers in the kernel in order to enable
USB and Ethernet functionality. This fix ensures that they are built in
by tweaking the kernel config.
Tested on Beagleboard xM Rev. C2.
(From OE-Core rev: 89a372840a957e540bed954e629aa68335b3dfe0)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the meta branch SRCREV to update the USB configuration:
The Beagleboard needs the USB PHY drivers in the kernel in order to enable
USB and Ethernet functionality. This fix ensures that they are built in
by tweaking the kernel config.
Tested on Beagleboard xM Rev. C2.
(From OE-Core rev: 2a9944514362445ee891f6e77c4ae62950e247b3)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This update fixes two issues:
a) qemuarm boot failure
v3.10.13 picked up a patch for arm versatile interrupt mappings that fixes
the emulator boot out of the box. But it interacts badly with our previous
fix for the issue. Reverting the existing patch and going with the mainline
solution fixes the boot.
b) qemumips build warning and failure
Depending on the build host and compiler, the build of menuconfig throws
an potentially uninitialized variable warning. That warning causes an
error on archs with -Werror. We can do a trivial change to avoid the
warning all together (initilize it to null), and keep everyone happy.
[YOCTO #5460]
(From OE-Core rev: 8d1a041891c87d0c2003c80f84b0501bdc9403a1)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the meta branch SRCREV to import some configuration updates
for the common-pc-wifi feature:
CONFIG_WEXT_CORE=y
CONFIG_WEXT_PROC=y
CONFIG_CFG80211_WEXT=y
CONFIG_BCMA=m
CONFIG_BCMA_HOST_PCI_POSSIBLE=y
CONFIG_BCMA_HOST_PCI=y
CONFIG_BCMA_DRIVER_GMAC_CMN=y
CONFIG_CRC8=m
CONFIG_CORDIC=m
(From OE-Core rev: cdd8145a7f4abc75c4089a30206c277db2712649)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the 3.10 SRCREVs to add support for the haswell-sc and crystalforest
boards.
(From OE-Core rev: 47ebe8677ac0dc4f8799d0af75f5b7bc611fd882)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the SRCREVs to reflect the integration of the .17 -stable release
and the preempt-rt up date to -rt11.
(From OE-Core rev: cefa022b814b8b4f9afacecf3bb035d211a0f3bf)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the 3.10 SRCREVs to update minnowboard support via the following changes:
3F6C824 pch_gbe: Add MinnowBoard support
9f52743 pch_gbe: Use PCH_GBE_PHY_REGS_LEN instead of 32
ec7b5e6 pch_gbe: use managed functions pcim_* and devm_*
fd8bf50 pch_gbe: convert pr_* to netdev_*
9b278e9 serial: pch_uart: fix compilation warning
8982d79 serial: pch_uart: Fix signed-ness and casting of uartclk related fields
cdbf456 serial: pch_uart: Remove __initdata annotation from dmi_table
9e7c25e pch_uart: Use DMI interface for board detection
(From OE-Core rev: 6c7115a56c3d0bf3d6d0275bd2d49d8cfef5c028)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the meta branch SRCREV to incorporate the two following
configuration changes:
452f067 lxc: Add lxc kernel config
a249eba x86_32: Enable X86_32 and disable 64BIT explicitly
(From OE-Core rev: 64d4c508652bc5d8a0b4c01f0d0813e58d6b39a6)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the meta branch SRCREV with the following commit:
[
The oe-core live class now fully support compressed ISO images this is
the corresponding kernel change.
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
]
(From OE-Core rev: af2ef5085e92ca6291dabb134a7a3fb194a21d7a)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We have a number (in fact most) BSPs that require INPUT_EVDEV for basic
functionality. The size increase is minimal, so we'll add it to the
standard configuration for all platforms.
(From OE-Core rev: 965affabbf36fa5b5e466d331479c2295269242e)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Bumping the 3.10 meta branch SRCREV to import the following config changes
for tghe sugarbay and common-pc wifi fragments.
dad2b7e common-pc-64: add kernel CONFIG options for sugarbay platform
37c617d common-pc-wifi.cfg: add support for broadcom wifi drivers
[YOCTO #5117]
[YOCTO #5238]
(From OE-Core rev: 180f465b0cab13e17dc92ac5c88d7d9001cd5b11)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
perf's builtin-sched.c triggers extremly long build times on some
architectures due to gcc 4.7+ var-tracking functionality.
To fix this, we can cherry pick the 3.12 commit:
f36f83f94 [perf sched: Move struct perf_sched definition out of cmd_sched()]
With this change build times are reduced from 15 to 20 minutes for qemuarm to:
real 2m19.940s
user 1m35.438s
sys 0m11.165s
For kernel's that are not carrying this patch, the following can be added
to the perf recipe to also fix the issue:
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -68,6 +68,7 @@ EXTRA_OEMAKE = \
CC="${CC}" \
AR="${AR}" \
perfexecdir=${libexecdir} \
+ EXTRA_CFLAGS="-fno-var-tracking" \
NO_GTK2=1 ${TUI_DEFINES} NO_DWARF=1 ${SCRIPTING_DEFINES} \
(From OE-Core rev: 82ad5305381c2f541ef051a8fc28243cd91776fe)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
