Skip to contentSkip to conversation

linux-yocto: consolidated pull request

PATCH New Bruce Ashfield 1 participant 4 messages Dec 8, 2011

lore
Share & tools
lore

Bruce Ashfield

author
#0 lore raw

cover linux-yocto: consolidated pull request

Richard/Saul,

Flushing my queue of pending updates. This refreshes the 3.0 base to v3.0.12 and updates our -rt branches to the corresponding update.

This also pulls in the EFI changes from Darren.

This one should be random carrage return free, built and booted locally. Smoke tests all pass.

Cheers,

Bruce

cc Darren Hart <[email protected]>

The following changes since commit 30301333f8277228ad4d9213cb801a8ac75f6373:

package.bbclass: Adding license collection (2011-12-08 15:24:32 +0000)

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 (3):
linux-yocto: v3.0.12 + EFI fixes
linux-yocto: update META SRCREV for EFI changes
linux-yocto: update rt branches to 3.0.12 + rt30

 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb |    8 ++++----
 meta/recipes-kernel/linux/linux-yocto_3.0.bb    |   18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)
Signature · 1 line
1.7.4.1
author
#1 lore raw

PATCH 1/3 linux-yocto: v3.0.12 + EFI fixes

Updating SRCREVs to pickup the v3.0.12 -stable updates and to get three EFI fixes from Darren Hart:

x86, efi: Convert efi_phys_get_time() args to physical addresses x86, efi: Make efi_call_phys_prelog() CONFIG_RELOCATABLE-aware x86/rtc: Don't recursively acquire rtc_lock

Signed-off-by Darren Hart <[email protected]>
Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto_3.0.bb |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)
meta/recipes-kernel/linux/linux-yocto_3.0.bb +9 -9
index 4032567..ee2363c 100644
@@ -10,15 +10,15 @@ KMACHINE_qemuarm  = "yocto/standard/arm-versatile-926ejs"
 
 KBRANCH = ${KMACHINE}
 
-LINUX_VERSION ?= "3.0.10"
-
-SRCREV_machine_qemuarm ?= "42573a6932e65456471efa94d4863b8df88e48b3"
-SRCREV_machine_qemumips ?= "55d4921f21dea9f07344029c12400bb3ef15d76b"
-SRCREV_machine_qemuppc ?= "d10f26a8325a40610fc8d6a830a9f34dcb794075"
-SRCREV_machine_qemux86 ?= "7814f075ea132cc17da89ecd6d886036e61e2187"
-SRCREV_machine_qemux86-64 ?= "988fcbe64829f0a03ccfcc08d45cedb26cabe9ed"
-SRCREV_machine ?= "ab1de8c21d2b1d084b8488496d75cc54fcd94f02"
-SRCREV_meta ?= "67ce7623909cef63927fd145026aaf371cf4abf1"
+LINUX_VERSION ?= "3.0.12"
+
+SRCREV_machine_qemuarm ?= "b2a7d668b963f1c5f9876f130278dd9fb7df4831"
+SRCREV_machine_qemumips ?= "62bb04e5ba19b5b8aacd9079fdfbcb8284cd9fc8"
+SRCREV_machine_qemuppc ?= "7ecece328c5987112de2959f8f998dfcedaf7210"
+SRCREV_machine_qemux86 ?= "a611ba462ac51b2bfdac1c5c6538dac95ad9b4dd"
+SRCREV_machine_qemux86-64 ?= "b15a9b67089e31ef9780fdbd0481f48ef7facdba"
+SRCREV_machine ?= "f389d310965a56091f688b28ea8be6d9cbb7fbbe"
+SRCREV_meta ?= "a67d091fddd6b72dacc37fb4b07c870aebb1b835"
 
 PR = "r2"
 PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
1.7.4.1
author
#2 lore raw

PATCH 2/3 linux-yocto: update META SRCREV for EFI changes

In reply to Bruce Ashfield

Adding EFI configuration from the following meta branch commit:

Add EFI scc and cfg files

Basic EFI support only requires CONFIG_EFI=y, this is sufficient for some boards, and desirable for small configs. This is done with efi.scc.

Additional support for CONFIG_EFI_VARS, CONFIG_EFI_PARTITION, and CONFIG_FB_EFI is provided via efi-ext.scc (extended) as this pulls in the block layer, framebuffer support, and virtual terminals.

I'd like EFI_VARS to be part of the base config, but I have received reports of it failing in some situations. Keeping it separate ensures basic boot can work with the fragments as defined.

Signed-off-by Darren Hart <[email protected]>
Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.0.bb    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +1 -1
index 9833b90..e5af2cc 100644
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
 
 SRCREV_machine ?= "bffda9207cdc3b309bfa7b3e23eb7dc838f50223"
 SRCREV_machine_qemuppc ?= "f02dda1ccaf95f10a1e65359184e90484a5fd0d9"
-SRCREV_meta ?= "67ce7623909cef63927fd145026aaf371cf4abf1"
+SRCREV_meta ?= "caa74f86f42f6ecc22c3e9f380176b2695579e18"
 
 PR = "r1"
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_3.0.bb +1 -1
index ee2363c..bfecbf1 100644
@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "7ecece328c5987112de2959f8f998dfcedaf7210"
 SRCREV_machine_qemux86 ?= "a611ba462ac51b2bfdac1c5c6538dac95ad9b4dd"
 SRCREV_machine_qemux86-64 ?= "b15a9b67089e31ef9780fdbd0481f48ef7facdba"
 SRCREV_machine ?= "f389d310965a56091f688b28ea8be6d9cbb7fbbe"
-SRCREV_meta ?= "a67d091fddd6b72dacc37fb4b07c870aebb1b835"
+SRCREV_meta ?= "caa74f86f42f6ecc22c3e9f380176b2695579e18"
 
 PR = "r2"
 PV = "${LINUX_VERSION}+git${SRCPV}"
Signature · 1 line
1.7.4.1
author
#3 lore raw

PATCH 3/3 linux-yocto: update rt branches to 3.0.12 + rt30

In reply to Bruce Ashfield

Updating the SRCREVs to v3.0.12 and the rt30 patch.

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +3 -3
index e5af2cc..6c9917f 100644
@@ -11,11 +11,11 @@ KMACHINE_qemumips = "mti-malta32-be"
 KBRANCH = "yocto/standard/preempt-rt/base"
 KBRANCH_qemuppc = "yocto/standard/preempt-rt/qemu-ppc32"
 
-LINUX_VERSION ?= "3.0.10"
+LINUX_VERSION ?= "3.0.12"
 LINUX_KERNEL_TYPE = "preempt-rt"
 
-SRCREV_machine ?= "bffda9207cdc3b309bfa7b3e23eb7dc838f50223"
-SRCREV_machine_qemuppc ?= "f02dda1ccaf95f10a1e65359184e90484a5fd0d9"
+SRCREV_machine ?= "6e96ccbbf19a4a7b67d98fdcd74d2c9da2c7c463"
+SRCREV_machine_qemuppc ?= "8ea61de7fd201ff0001a039f2fda8ec2e4a562a1"
 SRCREV_meta ?= "caa74f86f42f6ecc22c3e9f380176b2695579e18"
 
 PR = "r1"
Signature · 1 line
1.7.4.1