[PATCH 0/7] linux-yocto: consolidated pull request

[PATCH 0/7] linux-yocto: consolidated pull request

[Bruce Ashfield]

Richard,

This pull request covers configuration and BSP fixes that I've been 
gathering for 3.19 and 3.14.

There are two minor Yocto bug fixes as well:

  linux-yocto-custom: clarify bbappend versus copy in comments
  linux-yocto: drop suggestion of devshell for patch failures

This doesn't contain the 3.14 or 3.19 gcc5 changes, since mips is 
being problematic and the other changes are tied to that arch 
getting sorted out.

Cheers,

Bruce

The following changes since commit 16caaabfcc678b03a0cd88aaeac15f9b8d1c3dad:

  bitbake: bitbake-user-manual-customization.xsl: Pointing to mirrors for XSL files. (2015-05-19 22:09:36 +0100)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib zedd/kernel
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Bruce Ashfield (7):
  linux-yocto/3.14: cavium and configuration changes
  linux-yocto/3.19: braswell DRM/i915 Graphics fixes
  linux-yocto-custom: clarify bbappend versus copy in comments
  linux-yocto: drop suggestion of devshell for patch failures
  linux-yocto/3.19: Braswell DRM fixes
  linux-yocto/3.19: CONFIG_ATA_BMDMA and gcc5 ARM64
  linux-yocto/3.19: NFC config, Braswell fixes and axxia support

 .../recipes-kernel/linux/linux-yocto-custom.bb         | 10 +++++-----
 meta/classes/kernel-yocto.bbclass                      |  2 +-
 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb       |  6 +++---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb     |  4 ++--
 meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb     |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_3.14.bb          | 18 +++++++++---------
 meta/recipes-kernel/linux/linux-yocto_3.19.bb          | 18 +++++++++---------
 7 files changed, 31 insertions(+), 31 deletions(-)

-- 
2.1.0

[PATCH 1/7] linux-yocto/3.14: cavium and configuration changes

[Bruce Ashfield]

Updating the 3.14 SRCREVs to integrate the latest round of cavium
support patches, as well as configuration backports from 3.19.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb   |  6 +++---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_3.14.bb      | 18 +++++++++---------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
index 86b31738b609..7da7f83b3ad0 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.14.bb
@@ -3,9 +3,9 @@ KBRANCH_qemuppc ?= "standard/preempt-rt/qemuppc"
 
 require recipes-kernel/linux/linux-yocto.inc
 
-SRCREV_machine ?= "0c641a6c0e38137364535b99e43657a0cbc07cd4"
-SRCREV_machine_qemuppc ?= "cfc4e296efcaa84358c9ab1cdeee6ce7c378436f"
-SRCREV_meta ?= "46df2668fa657162d11f96a6f1af138c562a03aa"
+SRCREV_machine ?= "3428de71031ede23682dd0842b9cfc23ae465f39"
+SRCREV_machine_qemuppc ?= "32c44a56a8218c3349f50d8151a10252d5e85dd1"
+SRCREV_meta ?= "a996d95104b72c422a56e7d9bc8615ec4219ac74"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
index d0b71c4859b1..000f288fb3e1 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.14.bb
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "3.14.36"
 KMETA = "meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "b991a586470900e3de824f5ea75653aa2150594d"
-SRCREV_meta ?= "46df2668fa657162d11f96a6f1af138c562a03aa"
+SRCREV_machine ?= "bda175966009d5a94103559e6e6ae51279952f39"
+SRCREV_meta ?= "a996d95104b72c422a56e7d9bc8615ec4219ac74"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.14.bb b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
index d4ea55a2398e..c809d2e29f60 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.14.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.14.bb
@@ -11,15 +11,15 @@ KBRANCH_qemux86  ?= "standard/common-pc/base"
 KBRANCH_qemux86-64 ?= "standard/common-pc-64/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "e4f91293908648d495b4f9735768633569e39b9f"
-SRCREV_machine_qemuarm64 ?= "b991a586470900e3de824f5ea75653aa2150594d"
-SRCREV_machine_qemumips ?= "6623389731309b0ac591736d5b438de833f195c7"
-SRCREV_machine_qemuppc ?= "3217fbcd002914fba4914d2e61dabb378081fd25"
-SRCREV_machine_qemux86 ?= "8794bd6a473199b2baa7a405d44cdbfa5351b60b"
-SRCREV_machine_qemux86-64 ?= "b991a586470900e3de824f5ea75653aa2150594d"
-SRCREV_machine_qemumips64 ?= "6649ef219b3bf6da1678547b9da376367520e80a"
-SRCREV_machine ?= "b991a586470900e3de824f5ea75653aa2150594d"
-SRCREV_meta ?= "46df2668fa657162d11f96a6f1af138c562a03aa"
+SRCREV_machine_qemuarm ?= "dbd8e70653ffb6b63a1b8b7134813d3a93975ff5"
+SRCREV_machine_qemuarm64 ?= "bda175966009d5a94103559e6e6ae51279952f39"
+SRCREV_machine_qemumips ?= "b985d5039e5b14f5acac135a84f2d6541b531552"
+SRCREV_machine_qemuppc ?= "dbbdaf47fae37664ea30181b18a436b3d5401293"
+SRCREV_machine_qemux86 ?= "d3943ebf24457188669472c85d82ab32e2f95f6b"
+SRCREV_machine_qemux86-64 ?= "bda175966009d5a94103559e6e6ae51279952f39"
+SRCREV_machine_qemumips64 ?= "a594ff1fef248d72bf4ef929fa4497cf54a04500"
+SRCREV_machine ?= "bda175966009d5a94103559e6e6ae51279952f39"
+SRCREV_meta ?= "a996d95104b72c422a56e7d9bc8615ec4219ac74"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.14.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
-- 
2.1.0

[PATCH 2/7] linux-yocto/3.19: braswell DRM/i915 Graphics fixes

[Bruce Ashfield]

Updating the SRCREVs to integrate the following fixes:

   0befa35f4099 drm/i915/chv: Remove DPIO force latency causing interpair skew issue
   184e0374e4eb drm/i915: Fix chv cdclk support
   e2a99b9cd086 drm/i915: Increase the range of sideband address.
   9d5d55ede53b drm/i915: Disable DDR DVFS on CHV
   96cce945ac97 drm/i915: Enable the maxfifo PM5 mode when appropriate on CHV
   b5005319da56 drm/i915: Program PFI credits for VLV
   c7aa33eb3697 drm/i915: Rewrite VLV/CHV watermark code
   a421d8bcaa6d drm/i915: Make sure PND deadline mode is enabled on VLV/CHV
   631afc98c4b5 drm/i915: Read out display FIFO size on VLV/CHV
   e0dcdc019b8a drm/i915: Pass plane to vlv_compute_drain_latency()
   a6a5562b7754 drm/i915: Reorganize VLV DDL setup
   bb662a47ec0c drm/i915: Hide VLV DDL precision handling
   3d2d93239cd7 drm/i915: Simplify VLV drain latency computation
   f68614743b92 drm/i915: Kill DRAIN_LATENCY_PRECISION_* defines
   86c658c06ede drm/i915: Reduce CHV DDL multiplier to 16/8
   8c4cdd96a3f2 drm/i915: Allow pixel clock up to 95% of cdclk on CHV
   d9d4fb889c2a drm/i915: Reduce CHV DPLL min vco frequency to 4.8 GHz

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto_3.19.bb      | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
index 50a426d665bf..d8f8d498ad27 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "3.19.5"
 KMETA = "meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "0a0d499541e2bb13ecc1001d0947bed6106c26a6"
+SRCREV_machine ?= "0befa35f40997c90936047e57fbbdd7edbf7e525"
 SRCREV_meta ?= "7215fe431391a322c7e39f410e7b8f2a2b507892"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.19.bb b/meta/recipes-kernel/linux/linux-yocto_3.19.bb
index 429c019ece79..b6ec61a43b98 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.19.bb
@@ -11,14 +11,14 @@ KBRANCH_qemux86  ?= "standard/common-pc"
 KBRANCH_qemux86-64 ?= "standard/common-pc-64/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "060c6306d0be2726638ab18bd68977de4c7a38e5"
-SRCREV_machine_qemuarm64 ?= "0a0d499541e2bb13ecc1001d0947bed6106c26a6"
-SRCREV_machine_qemumips ?= "4b206f611f6d4c35a27a44e24ba0cedfc71301ec"
-SRCREV_machine_qemuppc ?= "18e00694ed76d18bf020e3288a6fdce63412887d"
-SRCREV_machine_qemux86 ?= "0a0d499541e2bb13ecc1001d0947bed6106c26a6"
-SRCREV_machine_qemux86-64 ?= "0a0d499541e2bb13ecc1001d0947bed6106c26a6"
-SRCREV_machine_qemumips64 ?= "0e31a9b3e54a2c87645f34bcbbe704ac62c04602"
-SRCREV_machine ?= "0a0d499541e2bb13ecc1001d0947bed6106c26a6"
+SRCREV_machine_qemuarm ?= "123f12cf162082802442d70701d83749376c45df"
+SRCREV_machine_qemuarm64 ?= "0befa35f40997c90936047e57fbbdd7edbf7e525"
+SRCREV_machine_qemumips ?= "c6bc6e6a10b188f96b9761411421be78ee67aa75"
+SRCREV_machine_qemuppc ?= "b79584c854f875890d708d7fb3cda85430a9d3ec"
+SRCREV_machine_qemux86 ?= "0befa35f40997c90936047e57fbbdd7edbf7e525"
+SRCREV_machine_qemux86-64 ?= "0befa35f40997c90936047e57fbbdd7edbf7e525"
+SRCREV_machine_qemumips64 ?= "b25c62fa52d51dac118b0eed20b8d5971434fa80"
+SRCREV_machine ?= "0befa35f40997c90936047e57fbbdd7edbf7e525"
 SRCREV_meta ?= "7215fe431391a322c7e39f410e7b8f2a2b507892"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.19.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
-- 
2.1.0

[PATCH 3/7] linux-yocto-custom: clarify bbappend versus copy in comments

[Bruce Ashfield]

The kernel development manual recommends making a copy of
linux-yocto-custom, while the comments in the recipe talk about
bbappends.

To synchronize the two, we remove the bbappend references from the
recipe and instead indicate that a copy should be updated.

[YOCTO: #6925]

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
index 05463c026304..e38af19f827b 100644
--- a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
+++ b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
@@ -11,8 +11,8 @@
 #
 #   You must also provide a Linux kernel configuration. The most direct
 #   method is to copy your .config to files/defconfig in your layer,
-#   in the same directory as the bbappend and add file://defconfig to
-#   your SRC_URI.
+#   in the same directory as the copy (and rename) of this recipe and
+#   add file://defconfig to your SRC_URI.
 #
 #   To use the yocto kernel tooling to generate a BSP configuration
 #   using modular configuration fragments, see the yocto-bsp and
@@ -52,14 +52,14 @@
 inherit kernel
 require recipes-kernel/linux/linux-yocto.inc
 
-# Override SRC_URI in a bbappend file to point at a different source
+# Override SRC_URI in a copy of this recipe to point at a different source
 # tree if you do not want to build from Linus' tree.
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;nocheckout=1;name=machine"
 
 LINUX_VERSION ?= "3.4"
 LINUX_VERSION_EXTENSION ?= "-custom"
 
-# Override SRCREV to point to a different commit in a bbappend file to
+# Override SRCREV to point to a different commit in a copy of this recipe
 # build a different release of the Linux kernel.
 # tag: v3.4 76e10d158efb6d4516018846f60c2ab5501900bc
 SRCREV_machine="76e10d158efb6d4516018846f60c2ab5501900bc"
@@ -67,6 +67,6 @@ SRCREV_machine="76e10d158efb6d4516018846f60c2ab5501900bc"
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
-# Override COMPATIBLE_MACHINE to include your machine in a bbappend
+# Override COMPATIBLE_MACHINE to include your machine in a copy of this recipe
 # file. Leaving it empty here ensures an early explicit build failure.
 COMPATIBLE_MACHINE = "(^$)"
-- 
2.1.0

[PATCH 4/7] linux-yocto: drop suggestion of devshell for patch failures

[Bruce Ashfield]

When a patch fails to apply, the kernel-yocto bbclass attempted to
be helpful and suggest that devshell be used to fix the issue.

The only problem is that you can't get to devshell if a patch is
failing.

We drop this bad advise and instead point to the linux source directory.

[YOCTO: #6202]

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/classes/kernel-yocto.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 88588d7cacc9..6fd025ef1e0c 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -163,7 +163,7 @@ do_patch() {
 	patchme ${KMACHINE}
 	if [ $? -ne 0 ]; then
 		bberror "Could not apply patches for ${KMACHINE}."
-		bbfatal "Patch failures can be resolved in the devshell (bitbake -c devshell ${PN})"
+		bbfatal "Patch failures can be resolved in the linux source directory ${S})"
 	fi
 
 	# check to see if the specified SRCREV is reachable from the final branch.
-- 
2.1.0

[PATCH 5/7] linux-yocto/3.19: Braswell DRM fixes

[Bruce Ashfield]

Updating the 3.19 kernel SRCREVs to integrate the following Braswell
changes:

  374b5d0e09ea drm/i915: Only wait for required lanes in vlv_wait_port_ready()
  fca99e8ee111 Revert "drm/i915: Hack to tie both common lanes together on chv"
  00682f31b612 drm/i915: Work around DISPLAY_PHY_CONTROL register corruption on CHV
  654b1a4497c5 drm/i915: Implement chv display PHY lane stagger setup

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb |  2 +-
 meta/recipes-kernel/linux/linux-yocto_3.19.bb      | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
index d8f8d498ad27..e55a75a74e4e 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
@@ -9,7 +9,7 @@ LINUX_VERSION ?= "3.19.5"
 KMETA = "meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "0befa35f40997c90936047e57fbbdd7edbf7e525"
+SRCREV_machine ?= "374b5d0e09ea016975f3d5ab5544968f31054f52"
 SRCREV_meta ?= "7215fe431391a322c7e39f410e7b8f2a2b507892"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.19.bb b/meta/recipes-kernel/linux/linux-yocto_3.19.bb
index b6ec61a43b98..72fe25ac867f 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.19.bb
@@ -11,14 +11,14 @@ KBRANCH_qemux86  ?= "standard/common-pc"
 KBRANCH_qemux86-64 ?= "standard/common-pc-64/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "123f12cf162082802442d70701d83749376c45df"
-SRCREV_machine_qemuarm64 ?= "0befa35f40997c90936047e57fbbdd7edbf7e525"
-SRCREV_machine_qemumips ?= "c6bc6e6a10b188f96b9761411421be78ee67aa75"
-SRCREV_machine_qemuppc ?= "b79584c854f875890d708d7fb3cda85430a9d3ec"
-SRCREV_machine_qemux86 ?= "0befa35f40997c90936047e57fbbdd7edbf7e525"
-SRCREV_machine_qemux86-64 ?= "0befa35f40997c90936047e57fbbdd7edbf7e525"
-SRCREV_machine_qemumips64 ?= "b25c62fa52d51dac118b0eed20b8d5971434fa80"
-SRCREV_machine ?= "0befa35f40997c90936047e57fbbdd7edbf7e525"
+SRCREV_machine_qemuarm ?= "00d625a9e909ff5cbf138cb20dc54e10f30638b3"
+SRCREV_machine_qemuarm64 ?= "374b5d0e09ea016975f3d5ab5544968f31054f52"
+SRCREV_machine_qemumips ?= "76bf3763b224e6d15c060206015f787e8968a4d7"
+SRCREV_machine_qemuppc ?= "6188d8bb5f774f0f760225f34371e94fcf8615d4"
+SRCREV_machine_qemux86 ?= "374b5d0e09ea016975f3d5ab5544968f31054f52"
+SRCREV_machine_qemux86-64 ?= "374b5d0e09ea016975f3d5ab5544968f31054f52"
+SRCREV_machine_qemumips64 ?= "623f6699ea6c4148579c8ede54ccfe0f3784b531"
+SRCREV_machine ?= "374b5d0e09ea016975f3d5ab5544968f31054f52"
 SRCREV_meta ?= "7215fe431391a322c7e39f410e7b8f2a2b507892"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.19.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
-- 
2.1.0

[PATCH 6/7] linux-yocto/3.19: CONFIG_ATA_BMDMA and gcc5 ARM64

[Bruce Ashfield]

Integrating the following commit to remove a ATA configuration warning:

    common-pc-drivers: Enable CONFIG_ATA_BMDMA

    Enabling the ATA_BMDMA re-enables ATA_PIIX which was getting
    disabled

    Signed-off-by: Saul Wold <sgw@linux.intel.com>

And the following to fix the ARM64 gcc5 boot:

    arm64: psci: move psci firmware calls out of line

    An arm64 allmodconfig fails to build with GCC 5 due to __asmeq
    assertions in the PSCI firmware calling code firing due to mcount
    preambles breaking our assumptions about register allocation of
    function
    arguments:

      /tmp/ccDqJsJ6.s: Assembler messages:
      /tmp/ccDqJsJ6.s:60: Error: .err encountered
      /tmp/ccDqJsJ6.s:61: Error: .err encountered
      /tmp/ccDqJsJ6.s:62: Error: .err encountered
      /tmp/ccDqJsJ6.s:99: Error: .err encountered
      /tmp/ccDqJsJ6.s:100: Error: .err encountered
      /tmp/ccDqJsJ6.s:101: Error: .err encountered

    This patch fixes the issue by moving the PSCI calls out-of-line into
    their own assembly files, which are safe from the compiler's
    meddling
    fingers.

    Reported-by: Andy Whitcroft <apw@canonical.com>
    Signed-off-by: Will Deacon <will.deacon@arm.com>
    Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
    Signed-off-by: Armin Kuter <akuster@mvista.com>

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_3.19.bb      | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
index e55a75a74e4e..bb567d67a3fd 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "3.19.5"
 KMETA = "meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "374b5d0e09ea016975f3d5ab5544968f31054f52"
-SRCREV_meta ?= "7215fe431391a322c7e39f410e7b8f2a2b507892"
+SRCREV_machine ?= "a3f6f39fc369dba2816908bc1b324e0170aaa27d"
+SRCREV_meta ?= "44879ee54dce8e11695dcb476d1b178a48a71f6a"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.19.bb b/meta/recipes-kernel/linux/linux-yocto_3.19.bb
index 72fe25ac867f..8d8a8c5901d1 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.19.bb
@@ -11,15 +11,15 @@ KBRANCH_qemux86  ?= "standard/common-pc"
 KBRANCH_qemux86-64 ?= "standard/common-pc-64/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "00d625a9e909ff5cbf138cb20dc54e10f30638b3"
-SRCREV_machine_qemuarm64 ?= "374b5d0e09ea016975f3d5ab5544968f31054f52"
-SRCREV_machine_qemumips ?= "76bf3763b224e6d15c060206015f787e8968a4d7"
-SRCREV_machine_qemuppc ?= "6188d8bb5f774f0f760225f34371e94fcf8615d4"
-SRCREV_machine_qemux86 ?= "374b5d0e09ea016975f3d5ab5544968f31054f52"
-SRCREV_machine_qemux86-64 ?= "374b5d0e09ea016975f3d5ab5544968f31054f52"
-SRCREV_machine_qemumips64 ?= "623f6699ea6c4148579c8ede54ccfe0f3784b531"
-SRCREV_machine ?= "374b5d0e09ea016975f3d5ab5544968f31054f52"
-SRCREV_meta ?= "7215fe431391a322c7e39f410e7b8f2a2b507892"
+SRCREV_machine_qemuarm ?= "97428dbb2231f8a715de9db66f3c2358e4927716"
+SRCREV_machine_qemuarm64 ?= "a3f6f39fc369dba2816908bc1b324e0170aaa27d"
+SRCREV_machine_qemumips ?= "a4573b23f8fa35a6e93131fac2f1c0f1d5115fea"
+SRCREV_machine_qemuppc ?= "8bbd8a1369c773dbe8bed27b613aa4b7dd175670"
+SRCREV_machine_qemux86 ?= "a3f6f39fc369dba2816908bc1b324e0170aaa27d"
+SRCREV_machine_qemux86-64 ?= "a3f6f39fc369dba2816908bc1b324e0170aaa27d"
+SRCREV_machine_qemumips64 ?= "62681c2cfa32bee03aee368b704228bc91c2483f"
+SRCREV_machine ?= "a3f6f39fc369dba2816908bc1b324e0170aaa27d"
+SRCREV_meta ?= "44879ee54dce8e11695dcb476d1b178a48a71f6a"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.19.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
-- 
2.1.0

[PATCH 7/7] linux-yocto/3.19: NFC config, Braswell fixes and axxia support

[Bruce Ashfield]

Updating the 3.19 kernel SRCREVs for the following commits:

NFC:

   727cfce45077 meta: intel-common: enable generic NFC support
   f3e890065903 meta: features/nfc: add generic configuration for NFC support

Braswell:

   d3c0b958e688 drm/i915: New offset for reading frequencies on CHV.
   dac6babbba62 drm/i915/chv: Populate total EU count on Cherryview

Axxia:

   c706cb356dea arch/arm/axxia: Remove the axxia zImage.fm build
   45a1aaacf6cb drivers/hwmon: Remove adt75 redundant driver
   7203ee166c01 arch/arm/mach-axxia: Fixed L2 power up failure
   a1541e9f0a4c kernel/irq/manage.c: Fix irq_set_affinity to allow use with buslocks
   d42c0bd1c8be arch/arm/mach-axxia: Reverse checkpatch compatibility
   5dbd07431a7a arch/arm/mach-axxia: changed affinity parameter to cpu
   23e4ebc66acb char: hwrng: AXXIA TRNG driver added for AXM55xx
   61eb3c8ee1d7 arch/arm/mach-axxia: Updated Axxia 55xx PCIe driver to use correct Doorbell interrupt IRQs
   b03e0655094a AXM55xx RapidIO : Added support for Device revision and link down Monitor.
   7577ad26cf73 rionet: Fix the corruption of tx_cnt during Transmit.
   07fd2163ae56 arch/arm/mach-axxia: fixed NO SMP
   c9371e98cc80 arch/arm/mach-axxia: fixed compiler warning
   0a814fe7e747 arch/arm/mach-axxia: Updated PCIe driver doorbell support
   cd3d9b46bea4 misc: lsi-ncr: Only use AMP lock on PPC platforms.
   826c600c6ad6 fs: vmfs: Use generic mmap function
   e2d0047cb106 arch/arm/mach-axxia: Removed axxia_circular_queue
   f1ff06eaabed ARM: axxia: Add cluster and L2 power off in hotplug
   b98711344263 ARM: irq: Return error when set_affinity is called from hotplug
   9fd9306a30ae arch/arm/mach-axxia: Enable L3
   68989d446582 Revert "arch/arm/mach-axxia: Fixed affinity error on IRQ migration"
   0be0ef90a887 Revert "arch/arm/mach-axxia: fixed failure to power up cluster"
   1c6522a03e81 Revert "arch/arm/mach-axxia: fixed hang in preempt kernel"
   ef06a68393a3 fs/vmfs: Changes to add VMFS support for axxia.
   3025e9deede6 drivers/usb/host: Changes to support the axxia BSP
   b128b4f0d4e8 drivers/tty: Changes to support the axxia BSP
   d1b60a7e62ef drivers/hwmon: Changes made to support the axxia BSP
   2899ccbf1438 drivers/spi: Changes to support the axxia BSP
   8e9cff566254 drivers/rapidio/devices: Changes to support axxia BSP
   3424d2ca2653 drivers/net/ethernet: Changes to support the axxia BSP
   2353dc816d6b drivers/mtd: Changes to support the axxia BSP
   4b5fa2bf86cf drivers/misc: Changes made to support axxia BSP
   8a5bd53ec241 drivers/i2c: Changes to support axxia BSP
   02bfe1548d1a arch/arm/drivers/edac: Changes to support axxia BSP
   2431db7c0c90 arch/arm/drivers/dma: Changes to support the axxia BSP
   61fa3f268d5c arch/arm: arm changes to support the axxia BSP
   22e0fb7be665 arch/arm/mach-axxia: add power management support
   5cab63c5a1f2 arch/arm/mach-axxia: kernel files to support the mach-axxia
   1336aba51616 arch/arm/boot: Changes to support the axxia BSP
   97324fa920cb arch/arm/boot/dts: Files added to support axxia 5500 board

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_3.19.bb      | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
index bb567d67a3fd..777aa60b14c4 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.19.bb
@@ -9,8 +9,8 @@ LINUX_VERSION ?= "3.19.5"
 KMETA = "meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine ?= "a3f6f39fc369dba2816908bc1b324e0170aaa27d"
-SRCREV_meta ?= "44879ee54dce8e11695dcb476d1b178a48a71f6a"
+SRCREV_machine ?= "d3c0b958e68824c7037005e2a84e5661ba98d5b0"
+SRCREV_meta ?= "727cfce45077a1f73f1dbc42e8093fde0c5e36a7"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.19.bb b/meta/recipes-kernel/linux/linux-yocto_3.19.bb
index 8d8a8c5901d1..975b3afbf1d1 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.19.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.19.bb
@@ -11,15 +11,15 @@ KBRANCH_qemux86  ?= "standard/common-pc"
 KBRANCH_qemux86-64 ?= "standard/common-pc-64/base"
 KBRANCH_qemumips64 ?= "standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "97428dbb2231f8a715de9db66f3c2358e4927716"
-SRCREV_machine_qemuarm64 ?= "a3f6f39fc369dba2816908bc1b324e0170aaa27d"
-SRCREV_machine_qemumips ?= "a4573b23f8fa35a6e93131fac2f1c0f1d5115fea"
-SRCREV_machine_qemuppc ?= "8bbd8a1369c773dbe8bed27b613aa4b7dd175670"
-SRCREV_machine_qemux86 ?= "a3f6f39fc369dba2816908bc1b324e0170aaa27d"
-SRCREV_machine_qemux86-64 ?= "a3f6f39fc369dba2816908bc1b324e0170aaa27d"
-SRCREV_machine_qemumips64 ?= "62681c2cfa32bee03aee368b704228bc91c2483f"
-SRCREV_machine ?= "a3f6f39fc369dba2816908bc1b324e0170aaa27d"
-SRCREV_meta ?= "44879ee54dce8e11695dcb476d1b178a48a71f6a"
+SRCREV_machine_qemuarm ?= "e5aa4ad4249e079b8459a90b4ffa50d04b474458"
+SRCREV_machine_qemuarm64 ?= "d3c0b958e68824c7037005e2a84e5661ba98d5b0"
+SRCREV_machine_qemumips ?= "3b8cc925c5312b37cb824dfe58c2a4dcbb2b9732"
+SRCREV_machine_qemuppc ?= "4ac61cf97719f01c5cb226881956e77624fb534c"
+SRCREV_machine_qemux86 ?= "d3c0b958e68824c7037005e2a84e5661ba98d5b0"
+SRCREV_machine_qemux86-64 ?= "d3c0b958e68824c7037005e2a84e5661ba98d5b0"
+SRCREV_machine_qemumips64 ?= "f5bf944a0edde0e379af4296917d33a562e6586b"
+SRCREV_machine ?= "d3c0b958e68824c7037005e2a84e5661ba98d5b0"
+SRCREV_meta ?= "727cfce45077a1f73f1dbc42e8093fde0c5e36a7"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.19.git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
 
-- 
2.1.0

Re: [PATCH 3/7] linux-yocto-custom: clarify bbappend versus copy in comments

[Andre McCurdy]

On Thu, May 21, 2015 at 12:08 PM, Bruce Ashfield
<bruce.ashfield@windriver.com> wrote:
> The kernel development manual recommends making a copy of
> linux-yocto-custom, while the comments in the recipe talk about
> bbappends.
>
> To synchronize the two, we remove the bbappend references from the
> recipe and instead indicate that a copy should be updated.
>
> [YOCTO: #6925]
>
> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
> ---
>  meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
> index 05463c026304..e38af19f827b 100644
> --- a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
> +++ b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
> @@ -11,8 +11,8 @@
>  #
>  #   You must also provide a Linux kernel configuration. The most direct
>  #   method is to copy your .config to files/defconfig in your layer,
> -#   in the same directory as the bbappend and add file://defconfig to
> -#   your SRC_URI.
> +#   in the same directory as the copy (and rename) of this recipe and
> +#   add file://defconfig to your SRC_URI.
>  #
>  #   To use the yocto kernel tooling to generate a BSP configuration
>  #   using modular configuration fragments, see the yocto-bsp and
> @@ -52,14 +52,14 @@
>  inherit kernel
>  require recipes-kernel/linux/linux-yocto.inc
>
> -# Override SRC_URI in a bbappend file to point at a different source
> +# Override SRC_URI in a copy of this recipe to point at a different source
>  # tree if you do not want to build from Linus' tree.

Would "Update SRC_URI in your copy of this recipe..." make more sense here?

>  SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;nocheckout=1;name=machine"
>
>  LINUX_VERSION ?= "3.4"
>  LINUX_VERSION_EXTENSION ?= "-custom"
>
> -# Override SRCREV to point to a different commit in a bbappend file to
> +# Override SRCREV to point to a different commit in a copy of this recipe
>  # build a different release of the Linux kernel.
>  # tag: v3.4 76e10d158efb6d4516018846f60c2ab5501900bc

Same comment, "Override" -> "Update" and "a copy" -> "your copy".

Also, the word "to" seems to have gone missing from the end of the line.

>  SRCREV_machine="76e10d158efb6d4516018846f60c2ab5501900bc"
> @@ -67,6 +67,6 @@ SRCREV_machine="76e10d158efb6d4516018846f60c2ab5501900bc"
>  PR = "r1"
>  PV = "${LINUX_VERSION}+git${SRCPV}"
>
> -# Override COMPATIBLE_MACHINE to include your machine in a bbappend
> +# Override COMPATIBLE_MACHINE to include your machine in a copy of this recipe
>  # file. Leaving it empty here ensures an early explicit build failure.
>  COMPATIBLE_MACHINE = "(^$)"
> --
> 2.1.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH 3/7] linux-yocto-custom: clarify bbappend versus copy in comments

[Bruce Ashfield]

On 2015-05-21 5:55 PM, Andre McCurdy wrote:
> On Thu, May 21, 2015 at 12:08 PM, Bruce Ashfield
> <bruce.ashfield@windriver.com> wrote:
>> The kernel development manual recommends making a copy of
>> linux-yocto-custom, while the comments in the recipe talk about
>> bbappends.
>>
>> To synchronize the two, we remove the bbappend references from the
>> recipe and instead indicate that a copy should be updated.
>>
>> [YOCTO: #6925]
>>
>> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
>> ---
>>   meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb | 10 +++++-----
>>   1 file changed, 5 insertions(+), 5 deletions(-)
>>
>> diff --git a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
>> index 05463c026304..e38af19f827b 100644
>> --- a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
>> +++ b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
>> @@ -11,8 +11,8 @@
>>   #
>>   #   You must also provide a Linux kernel configuration. The most direct
>>   #   method is to copy your .config to files/defconfig in your layer,
>> -#   in the same directory as the bbappend and add file://defconfig to
>> -#   your SRC_URI.
>> +#   in the same directory as the copy (and rename) of this recipe and
>> +#   add file://defconfig to your SRC_URI.
>>   #
>>   #   To use the yocto kernel tooling to generate a BSP configuration
>>   #   using modular configuration fragments, see the yocto-bsp and
>> @@ -52,14 +52,14 @@
>>   inherit kernel
>>   require recipes-kernel/linux/linux-yocto.inc
>>
>> -# Override SRC_URI in a bbappend file to point at a different source
>> +# Override SRC_URI in a copy of this recipe to point at a different source
>>   # tree if you do not want to build from Linus' tree.
>
> Would "Update SRC_URI in your copy of this recipe..." make more sense here?

I avoided possessives on purpose, this could be one of many copies,
most may not be 'yours'.

>
>>   SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;nocheckout=1;name=machine"
>>
>>   LINUX_VERSION ?= "3.4"
>>   LINUX_VERSION_EXTENSION ?= "-custom"
>>
>> -# Override SRCREV to point to a different commit in a bbappend file to
>> +# Override SRCREV to point to a different commit in a copy of this recipe
>>   # build a different release of the Linux kernel.
>>   # tag: v3.4 76e10d158efb6d4516018846f60c2ab5501900bc
>
> Same comment, "Override" -> "Update" and "a copy" -> "your copy".

There's a default SRCREV in many configs, that's why I say override,
but update works too.

>
> Also, the word "to" seems to have gone missing from the end of the line.

Indeed. I'll add that back.

Bruce

>
>>   SRCREV_machine="76e10d158efb6d4516018846f60c2ab5501900bc"
>> @@ -67,6 +67,6 @@ SRCREV_machine="76e10d158efb6d4516018846f60c2ab5501900bc"
>>   PR = "r1"
>>   PV = "${LINUX_VERSION}+git${SRCPV}"
>>
>> -# Override COMPATIBLE_MACHINE to include your machine in a bbappend
>> +# Override COMPATIBLE_MACHINE to include your machine in a copy of this recipe
>>   # file. Leaving it empty here ensures an early explicit build failure.
>>   COMPATIBLE_MACHINE = "(^$)"
>> --
>> 2.1.0
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH 3/7] linux-yocto-custom: clarify bbappend versus copy in comments

[Andre McCurdy]

On Thu, May 21, 2015 at 5:59 PM, Bruce Ashfield
<bruce.ashfield@windriver.com> wrote:
> On 2015-05-21 5:55 PM, Andre McCurdy wrote:
>>
>> On Thu, May 21, 2015 at 12:08 PM, Bruce Ashfield
>> <bruce.ashfield@windriver.com> wrote:
>>>
>>> The kernel development manual recommends making a copy of
>>> linux-yocto-custom, while the comments in the recipe talk about
>>> bbappends.
>>>
>>> To synchronize the two, we remove the bbappend references from the
>>> recipe and instead indicate that a copy should be updated.
>>>
>>> [YOCTO: #6925]
>>>
>>> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
>>> ---
>>>   meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb | 10
>>> +++++-----
>>>   1 file changed, 5 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
>>> b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
>>> index 05463c026304..e38af19f827b 100644
>>> --- a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
>>> +++ b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
>>> @@ -11,8 +11,8 @@
>>>   #
>>>   #   You must also provide a Linux kernel configuration. The most direct
>>>   #   method is to copy your .config to files/defconfig in your layer,
>>> -#   in the same directory as the bbappend and add file://defconfig to
>>> -#   your SRC_URI.
>>> +#   in the same directory as the copy (and rename) of this recipe and
>>> +#   add file://defconfig to your SRC_URI.
>>>   #
>>>   #   To use the yocto kernel tooling to generate a BSP configuration
>>>   #   using modular configuration fragments, see the yocto-bsp and
>>> @@ -52,14 +52,14 @@
>>>   inherit kernel
>>>   require recipes-kernel/linux/linux-yocto.inc
>>>
>>> -# Override SRC_URI in a bbappend file to point at a different source
>>> +# Override SRC_URI in a copy of this recipe to point at a different
>>> source
>>>   # tree if you do not want to build from Linus' tree.
>>
>> Would "Update SRC_URI in your copy of this recipe..." make more sense
>> here?
>
> I avoided possessives on purpose, this could be one of many copies,
> most may not be 'yours'.

There's already mention of "your layer", "your .config" and "your
machine", so I don't think "your copy of this recipe" is out of place,
but "a copy of this recipe" is clear too.

>>>   SRC_URI =
>>> "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;nocheckout=1;name=machine"
>>>
>>>   LINUX_VERSION ?= "3.4"
>>>   LINUX_VERSION_EXTENSION ?= "-custom"
>>>
>>> -# Override SRCREV to point to a different commit in a bbappend file to
>>> +# Override SRCREV to point to a different commit in a copy of this
>>> recipe
>>>   # build a different release of the Linux kernel.
>>>   # tag: v3.4 76e10d158efb6d4516018846f60c2ab5501900bc
>>
>>
>> Same comment, "Override" -> "Update" and "a copy" -> "your copy".
>
>
> There's a default SRCREV in many configs, that's why I say override,
> but update works too.
>>
>> Also, the word "to" seems to have gone missing from the end of the line.
>
>
> Indeed. I'll add that back.
>
> Bruce
>
>
>>
>>>   SRCREV_machine="76e10d158efb6d4516018846f60c2ab5501900bc"
>>> @@ -67,6 +67,6 @@
>>> SRCREV_machine="76e10d158efb6d4516018846f60c2ab5501900bc"
>>>   PR = "r1"
>>>   PV = "${LINUX_VERSION}+git${SRCPV}"
>>>
>>> -# Override COMPATIBLE_MACHINE to include your machine in a bbappend
>>> +# Override COMPATIBLE_MACHINE to include your machine in a copy of this
>>> recipe
>>>   # file. Leaving it empty here ensures an early explicit build failure.
>>>   COMPATIBLE_MACHINE = "(^$)"
>>> --
>>> 2.1.0
>>>
>>> --
>>> _______________________________________________
>>> Openembedded-core mailing list
>>> Openembedded-core@lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>

Re: [PATCH 3/7] linux-yocto-custom: clarify bbappend versus copy in comments

[Bruce Ashfield]

On 2015-05-21 9:19 PM, Andre McCurdy wrote:
> On Thu, May 21, 2015 at 5:59 PM, Bruce Ashfield
> <bruce.ashfield@windriver.com> wrote:
>> On 2015-05-21 5:55 PM, Andre McCurdy wrote:
>>>
>>> On Thu, May 21, 2015 at 12:08 PM, Bruce Ashfield
>>> <bruce.ashfield@windriver.com> wrote:
>>>>
>>>> The kernel development manual recommends making a copy of
>>>> linux-yocto-custom, while the comments in the recipe talk about
>>>> bbappends.
>>>>
>>>> To synchronize the two, we remove the bbappend references from the
>>>> recipe and instead indicate that a copy should be updated.
>>>>
>>>> [YOCTO: #6925]
>>>>
>>>> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
>>>> ---
>>>>    meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb | 10
>>>> +++++-----
>>>>    1 file changed, 5 insertions(+), 5 deletions(-)
>>>>
>>>> diff --git a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
>>>> b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
>>>> index 05463c026304..e38af19f827b 100644
>>>> --- a/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
>>>> +++ b/meta-skeleton/recipes-kernel/linux/linux-yocto-custom.bb
>>>> @@ -11,8 +11,8 @@
>>>>    #
>>>>    #   You must also provide a Linux kernel configuration. The most direct
>>>>    #   method is to copy your .config to files/defconfig in your layer,
>>>> -#   in the same directory as the bbappend and add file://defconfig to
>>>> -#   your SRC_URI.
>>>> +#   in the same directory as the copy (and rename) of this recipe and
>>>> +#   add file://defconfig to your SRC_URI.
>>>>    #
>>>>    #   To use the yocto kernel tooling to generate a BSP configuration
>>>>    #   using modular configuration fragments, see the yocto-bsp and
>>>> @@ -52,14 +52,14 @@
>>>>    inherit kernel
>>>>    require recipes-kernel/linux/linux-yocto.inc
>>>>
>>>> -# Override SRC_URI in a bbappend file to point at a different source
>>>> +# Override SRC_URI in a copy of this recipe to point at a different
>>>> source
>>>>    # tree if you do not want to build from Linus' tree.
>>>
>>> Would "Update SRC_URI in your copy of this recipe..." make more sense
>>> here?
>>
>> I avoided possessives on purpose, this could be one of many copies,
>> most may not be 'yours'.
>
> There's already mention of "your layer", "your .config" and "your
> machine", so I don't think "your copy of this recipe" is out of place,
> but "a copy of this recipe" is clear too.

For a trivial patch, I'm just going to leave it as is. Old crimes
don't justify new ones. (and I'm the criminal in all cases ;)

Cheers,

Bruce

>
>>>>    SRC_URI =
>>>> "git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;protocol=git;nocheckout=1;name=machine"
>>>>
>>>>    LINUX_VERSION ?= "3.4"
>>>>    LINUX_VERSION_EXTENSION ?= "-custom"
>>>>
>>>> -# Override SRCREV to point to a different commit in a bbappend file to
>>>> +# Override SRCREV to point to a different commit in a copy of this
>>>> recipe
>>>>    # build a different release of the Linux kernel.
>>>>    # tag: v3.4 76e10d158efb6d4516018846f60c2ab5501900bc
>>>
>>>
>>> Same comment, "Override" -> "Update" and "a copy" -> "your copy".
>>
>>
>> There's a default SRCREV in many configs, that's why I say override,
>> but update works too.
>>>
>>> Also, the word "to" seems to have gone missing from the end of the line.
>>
>>
>> Indeed. I'll add that back.
>>
>> Bruce
>>
>>
>>>
>>>>    SRCREV_machine="76e10d158efb6d4516018846f60c2ab5501900bc"
>>>> @@ -67,6 +67,6 @@
>>>> SRCREV_machine="76e10d158efb6d4516018846f60c2ab5501900bc"
>>>>    PR = "r1"
>>>>    PV = "${LINUX_VERSION}+git${SRCPV}"
>>>>
>>>> -# Override COMPATIBLE_MACHINE to include your machine in a bbappend
>>>> +# Override COMPATIBLE_MACHINE to include your machine in a copy of this
>>>> recipe
>>>>    # file. Leaving it empty here ensures an early explicit build failure.
>>>>    COMPATIBLE_MACHINE = "(^$)"
>>>> --
>>>> 2.1.0
>>>>
>>>> --
>>>> _______________________________________________
>>>> Openembedded-core mailing list
>>>> Openembedded-core@lists.openembedded.org
>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>>