Skip to contentSkip to conversation

Update n450, fri2, and sys940x to 3.2

RFC PATCH In review Darren Hart 3 participants 14 messages May 1, 2012 – May 2, 2012

lore
Share & tools
lore
#0 lore raw

cover Update n450, fri2, and sys940x to 3.2

These patches update the n450, fri2, and sys940x machines to the 3.2 linux-yocto kernel. These patches have been built, booted, and usability tested on the three platforms for the linux-yocto-3.2 kernel using the sato image. The meta-kernel-dev layer was used to test these kernels using a local repository.

These patches are in final form with the exception of the SRCREV updates which will be required once the corresponding linux-yocto-3.2 patches have been committed. Once that happens I will push these to meta-intel with the appropriate SRCREV updates.

The following changes since commit bde31fd7e66faea865d24ff0858a9006b89e4e54:

meta-emenlow: update kernel SRCREVs (2012-04-26 15:24:31 -0500)

are available in the git repository at:
git://git.yoctoproject.org/meta-intel-contrib dvhart/update-3.2
http://git.yoctoproject.org/cgit.cgi/meta-intel-contrib/log/?h=dvhart/update-3.2

Darren Hart (7):
fri2: Prefer linux-yocto 3.2
linux-firmware: Move fri2 linux-firmware append to common
n450: Update to linux-yocto 3.2
sys940x: prefer xf86-input-evdev 2.6.0
sys940x: Add product URL to README
ia32-base.inc: Use a weak default assignment for kernel provider and
version
sys940x: Update to linux-yocto 3.2

 .../linux-firmware/linux-firmware_git.bbappend     |    0
 conf/machine/include/ia32-base.inc                 |    4 ++--
 meta-fri2/conf/machine/fri2-noemgd.conf            |    3 +++
 meta-fri2/conf/machine/fri2.conf                   |    3 +++
 meta-n450/conf/machine/n450.conf                   |    3 +++
 .../linux/linux-yocto-rt_3.2.bbappend              |   10 ++++++++++
 .../recipes-kernel/linux/linux-yocto_3.2.bbappend  |    7 +++++++
 meta-sys940x/README                                |    3 +++
 meta-sys940x/conf/machine/sys940x-noemgd.conf      |    2 ++
 meta-sys940x/conf/machine/sys940x.conf             |    3 +++
 .../linux/linux-yocto-rt_3.2.bbappend              |   12 ++++++++++++
 .../recipes-kernel/linux/linux-yocto_3.2.bbappend  |   15 +++++++++++++++
 12 files changed, 63 insertions(+), 2 deletions(-)
 rename {meta-fri2 => common}/recipes-kernel/linux-firmware/linux-firmware_git.bbappend (100%)
 create mode 100644 meta-n450/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend
 create mode 100644 meta-n450/recipes-kernel/linux/linux-yocto_3.2.bbappend
 create mode 100644 meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend
 create mode 100644 meta-sys940x/recipes-kernel/linux/linux-yocto_3.2.bbappend
Signature · 1 line
1.7.7.6
#1 lore raw

PATCH 1/7 fri2: Prefer linux-yocto 3.2

Update the Fish River Island II BSPs to build using linux-yocto_3.2 by default.

---
 meta-fri2/conf/machine/fri2-noemgd.conf |    3 +++
 meta-fri2/conf/machine/fri2.conf        |    3 +++
 2 files changed, 6 insertions(+), 0 deletions(-)
meta-fri2/conf/machine/fri2-noemgd.conf +3 -0
index 9ba5753..31c890a 100644
@@ -10,6 +10,9 @@ require conf/machine/include/ia32-base.inc
 MACHINE_FEATURES += "wifi 3g pcbios efi"
 MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"
 
+PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
+PREFERRED_VERSION_linux-yocto = "3.2%"
+
 XSERVER ?= "${XSERVER_IA32_BASE} \
            ${XSERVER_IA32_EXT} \
            ${XSERVER_IA32_VESA} \
meta-fri2/conf/machine/fri2.conf +3 -0
index 1cd6a3e..4924ca2 100644
@@ -10,6 +10,9 @@ require conf/machine/include/ia32-base.inc
 MACHINE_FEATURES += "wifi 3g pcbios efi"
 MACHINE_EXTRA_RRECOMMENDS += "linux-firmware-iwlwifi-6000g2a-5"
 
+PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
+PREFERRED_VERSION_linux-yocto = "3.2%"
+
 XSERVER ?= "${XSERVER_IA32_BASE} \
            ${XSERVER_IA32_EXT} \
            ${XSERVER_IA32_EMGD} \
Signature · 1 line
1.7.7.6
#2 lore raw

PATCH 2/7 linux-firmware: Move fri2 linux-firmware append to common

In reply to Darren Hart

In preparation for linux-firmware updates from new BSPs, move the fri2 linux-firmware bbappend into meta-intel/common. Eventually this should be moved into oe-core.

---
 .../linux-firmware/linux-firmware_git.bbappend     |    0
 1 files changed, 0 insertions(+), 0 deletions(-)
 rename {meta-fri2 => common}/recipes-kernel/linux-firmware/linux-firmware_git.bbappend (100%)
common/recipes-kernel/linux-firmware/linux-firmware_git.bbappend renamed from meta-fri2/recipes-kernel/linux-firmware/linux-firmware_git.bbappend +0 -0
similarity index 100%
rename from meta-fri2/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
rename to common/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
Signature · 1 line
1.7.7.6
Acked-by on v1 2/7
#3 lore raw

Re: [PATCH 2/7] linux-firmware: Move fri2 linux-firmware append to common

Quoted 5 lines · Darren Hart

In preparation for linux-firmware updates from new BSPs, move the fri2 linux-firmware bbappend into meta-intel/common. Eventually this should be moved into oe-core.

Quoted 9 lines
---
 .../linux-firmware/linux-firmware_git.bbappend     |    0
 1 files changed, 0 insertions(+), 0 deletions(-)
 rename {meta-fri2 => common}/recipes-kernel/linux-firmware/linux-firmware_git.bbappend (100%)
common/recipes-kernel/linux-firmware/linux-firmware_git.bbappend renamed from meta-fri2/recipes-kernel/linux-firmware/linux-firmware_git.bbappend +0 -0
similarity index 100%
rename from meta-fri2/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
rename to common/recipes-kernel/linux-firmware/linux-firmware_git.bbappend
#4 lore raw

PATCH 3/7 n450: Update to linux-yocto 3.2

In reply to Darren Hart

Update the PREFERRED_VERSION to 3.2.
Drop cfg/smp.scc as this is now included in common-pc.

---
 meta-n450/conf/machine/n450.conf                   |    3 +++
 .../linux/linux-yocto-rt_3.2.bbappend              |   10 ++++++++++
 .../recipes-kernel/linux/linux-yocto_3.2.bbappend  |    7 +++++++
 3 files changed, 20 insertions(+), 0 deletions(-)
 create mode 100644 meta-n450/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend
 create mode 100644 meta-n450/recipes-kernel/linux/linux-yocto_3.2.bbappend
meta-n450/conf/machine/n450.conf +3 -0
index dac63ed..7ce4cc7 100644
@@ -3,6 +3,9 @@
 
 #@DESCRIPTION: Machine configuration for Intel 1-N450 based systems
 
+PREFERRED_PROVIDER-virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "3.2%"
+
 require conf/machine/include/tune-atom.inc
 require conf/machine/include/ia32-base.inc
 
meta-n450/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend new file +10 -0
new file mode 100644
index 0000000..1c7fef9
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+COMPATIBLE_MACHINE_n450 = "n450"
+KMACHINE_n450 = "atom-pc"
+
+KERNEL_FEATURES_append_n450 += " cfg/smp.scc"
+
+# Update the following to use a different BSP branch or meta SRCREV
+#KBRANCH_n450 = "yocto/standard/preempt-rt/base"
+#SRCREV_machine_pn-linux-yocto-rt_n450 ?= XXXX
+#SRCREV_meta_pn-linux-yocto-rt_n450 ?= XXXX
meta-n450/recipes-kernel/linux/linux-yocto_3.2.bbappend new file +7 -0
new file mode 100644
index 0000000..f02c475
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+COMPATIBLE_MACHINE_n450 = "n450"
+KMACHINE_n450  = "atom-pc"
+KBRANCH_n450 = "standard/default/common-pc/base"
+
+#SRCREV_machine_pn-linux-yocto_n450 = XXXX
+#SRCREV_meta_pn-linux-yocto_n450 ?= XXXX
Signature · 1 line
1.7.7.6
#5 lore raw

Re: [PATCH 3/7] n450: Update to linux-yocto 3.2

Quoted 2 lines · Darren Hart

Update the PREFERRED_VERSION to 3.2.
Drop cfg/smp.scc as this is now included in common-pc.

Just having a look at the series now. Can you confirm for me if there are 3 or 7 patches for n450 ? I see the other syslinux series has 7 patches, but only 3 here. Just a number issue on the send ? Or did I manage to lose 4 changes ?

Cheers,

Bruce

Quoted 53 lines
---
  meta-n450/conf/machine/n450.conf                   |    3 +++
  .../linux/linux-yocto-rt_3.2.bbappend              |   10 ++++++++++
  .../recipes-kernel/linux/linux-yocto_3.2.bbappend  |    7 +++++++
  3 files changed, 20 insertions(+), 0 deletions(-)

create mode 100644 meta-n450/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend create mode 100644 meta-n450/recipes-kernel/linux/linux-yocto_3.2.bbappend

meta-n450/conf/machine/n450.conf +3 -0
index dac63ed..7ce4cc7 100644
@@ -3,6 +3,9 @@
 
  #@DESCRIPTION: Machine configuration for Intel 1-N450 based systems
 
+PREFERRED_PROVIDER-virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "3.2%"
+
  require conf/machine/include/tune-atom.inc
  require conf/machine/include/ia32-base.inc
 
meta-n450/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend new file +10 -0
new file mode 100644
index 0000000..1c7fef9
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+COMPATIBLE_MACHINE_n450 = "n450"
+KMACHINE_n450 = "atom-pc"
+
+KERNEL_FEATURES_append_n450 += " cfg/smp.scc"
+
+# Update the following to use a different BSP branch or meta SRCREV
+#KBRANCH_n450 = "yocto/standard/preempt-rt/base"
+#SRCREV_machine_pn-linux-yocto-rt_n450 ?= XXXX
+#SRCREV_meta_pn-linux-yocto-rt_n450 ?= XXXX
meta-n450/recipes-kernel/linux/linux-yocto_3.2.bbappend new file +7 -0
new file mode 100644
index 0000000..f02c475
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+COMPATIBLE_MACHINE_n450 = "n450"
+KMACHINE_n450  = "atom-pc"
+KBRANCH_n450 = "standard/default/common-pc/base"
+
+#SRCREV_machine_pn-linux-yocto_n450 = XXXX
+#SRCREV_meta_pn-linux-yocto_n450 ?= XXXX
#6 lore raw

Re: [PATCH 3/7] n450: Update to linux-yocto 3.2

Quoted 8 lines · Bruce Ashfield
Quoted 2 lines · Darren Hart

Update the PREFERRED_VERSION to 3.2.
Drop cfg/smp.scc as this is now included in common-pc.

Just having a look at the series now. Can you confirm for me if there are 3 or 7 patches for n450 ? I see the other syslinux series has 7 patches, but only 3 here. Just a number issue on the send ? Or did I manage to lose 4 changes ?

There is only 1 for n450, the rest are for other BSPs in meta-inte. See 0/7 for the list:

[PATCH 0/7][linux-yocto-3.2] fri2 and sys940x meta updates
...
Darren Hart (7):
fri2: Prefer linux-yocto 3.2
linux-firmware: Move fri2 linux-firmware append to common
n450: Update to linux-yocto 3.2
sys940x: prefer xf86-input-evdev 2.6.0
sys940x: Add product URL to README
ia32-base.inc: Use a weak default assignment for kernel provider and
version
sys940x: Update to linux-yocto 3.2

I then manually added "8/7":
sys940x: Drop PREFERRED_VERSION for emgd driver

Of course the 7 I'm hoping you're most concerned with are those for linux-yocto:

[PATCH 0/7][linux-yocto-3.2] fri2 and sys940x meta updates
...
Darren Hart (7):
fri2: Use emgd-1.10 feature and branch
fri2: Cleanup fri2-$KTYPE.scc files re efi-ext.scc
sys940x: Move emgd-1.10 data to the standard scc file
sys940x: Add efi-ext to standard and preempt-rt configs
sys940x: Add common standard and preempt-rt features
sys940x: Use PHYSICAL_START of 0x200000 to boot
sys940x: Cleanup sys940x.scc

Plus one more for standard/base:

[PATCH 0/1][linux-yocto-3.2] pch_gbe: Do not abort probe on bad MAC

Clear as mud?

Quoted 62 lines

Cheers,

Bruce

Quoted 46 lines
---
  meta-n450/conf/machine/n450.conf                   |    3 +++
  .../linux/linux-yocto-rt_3.2.bbappend              |   10 ++++++++++
  .../recipes-kernel/linux/linux-yocto_3.2.bbappend  |    7 +++++++
  3 files changed, 20 insertions(+), 0 deletions(-)

create mode 100644 meta-n450/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend create mode 100644 meta-n450/recipes-kernel/linux/linux-yocto_3.2.bbappend

meta-n450/conf/machine/n450.conf +3 -0
index dac63ed..7ce4cc7 100644
@@ -3,6 +3,9 @@
 
  #@DESCRIPTION: Machine configuration for Intel 1-N450 based systems
 
+PREFERRED_PROVIDER-virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "3.2%"
+
  require conf/machine/include/tune-atom.inc
  require conf/machine/include/ia32-base.inc
 
meta-n450/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend new file +10 -0
new file mode 100644
index 0000000..1c7fef9
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+COMPATIBLE_MACHINE_n450 = "n450"
+KMACHINE_n450 = "atom-pc"
+
+KERNEL_FEATURES_append_n450 += " cfg/smp.scc"
+
+# Update the following to use a different BSP branch or meta SRCREV
+#KBRANCH_n450 = "yocto/standard/preempt-rt/base"
+#SRCREV_machine_pn-linux-yocto-rt_n450 ?= XXXX
+#SRCREV_meta_pn-linux-yocto-rt_n450 ?= XXXX
meta-n450/recipes-kernel/linux/linux-yocto_3.2.bbappend new file +0 -0
new file mode 100644
index 0000000..f02c475

meta-n450/recipes-kernel/linux/linux-yocto_3.2.bbappend line 7

Quoted 7 lines
meta-n450/recipes-kernel/linux/linux-yocto_3.2.bbappend new file +7 -0
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+COMPATIBLE_MACHINE_n450 = "n450"
+KMACHINE_n450  = "atom-pc"
+KBRANCH_n450 = "standard/default/common-pc/base"
+
+#SRCREV_machine_pn-linux-yocto_n450 = XXXX
+#SRCREV_meta_pn-linux-yocto_n450 ?= XXXX

_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto

Signature · 3 lines
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel
#7 lore raw

Re: [PATCH 3/7] n450: Update to linux-yocto 3.2

Quoted 44 lines · Darren Hart
Quoted 8 lines · Bruce Ashfield
Quoted 2 lines · Darren Hart

Update the PREFERRED_VERSION to 3.2.
Drop cfg/smp.scc as this is now included in common-pc.

Just having a look at the series now. Can you confirm for me if there are 3 or 7 patches for n450 ? I see the other syslinux series has 7 patches, but only 3 here. Just a number issue on the send ? Or did I manage to lose 4 changes ?

There is only 1 for n450, the rest are for other BSPs in meta-inte. See 0/7 for the list:

[PATCH 0/7][linux-yocto-3.2] fri2 and sys940x meta updates
...
Darren Hart (7):
fri2: Prefer linux-yocto 3.2
linux-firmware: Move fri2 linux-firmware append to common
n450: Update to linux-yocto 3.2
sys940x: prefer xf86-input-evdev 2.6.0
sys940x: Add product URL to README
ia32-base.inc: Use a weak default assignment for kernel provider and
version
sys940x: Update to linux-yocto 3.2

I then manually added "8/7":

   sys940x: Drop PREFERRED_VERSION for emgd driver

Of course the 7 I'm hoping you're most concerned with are those for linux-yocto:

[PATCH 0/7][linux-yocto-3.2] fri2 and sys940x meta updates
...
Darren Hart (7):
fri2: Use emgd-1.10 feature and branch
fri2: Cleanup fri2-$KTYPE.scc files re efi-ext.scc
sys940x: Move emgd-1.10 data to the standard scc file
sys940x: Add efi-ext to standard and preempt-rt configs
sys940x: Add common standard and preempt-rt features
sys940x: Use PHYSICAL_START of 0x200000 to boot
sys940x: Cleanup sys940x.scc

Quoted 5 lines

Plus one more for standard/base:

[PATCH 0/1][linux-yocto-3.2] pch_gbe: Do not abort probe on bad MAC

Clear as mud?

Argh. Right you are, the linux-yocto-3.2 drew my attention and I see that these are outside the kernel tree .. so my scanning of them is really all that I needed to do.

I see the 8 kernel patches, and I'll focus on them, and getting them merged.

Thanks for the clarification. Jet lag has clouded my mind a bit :)

Bruce

Quoted 10 lines
Quoted 10 lines

Cheers,

Bruce

Quoted 5 lines
---
   meta-n450/conf/machine/n450.conf                   |    3 +++

.../linux/linux-yocto-rt_as Tai, he's got a lot of the KVM on powerpc work done. He's

up and booting on the 8548 and almost on the p4080. So the work is to complete and productize what he's done (and add other patches we find). Thomas may also help us out on this, so definitely sync up with him, to split the work and see if he can help :)
3.2.bbappend | 10 ++++++++++

Quoted 54 lines
Quoted 53 lines
Quoted 41 lines
   .../recipes-kernel/linux/linux-yocto_3.2.bbappend  |    7 +++++++
   3 files changed, 20 insertions(+), 0 deletions(-)

create mode 100644 meta-n450/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend create mode 100644 meta-n450/recipes-kernel/linux/linux-yocto_3.2.bbappend

meta-n450/conf/machine/n450.conf +3 -0
index dac63ed..7ce4cc7 100644
@@ -3,6 +3,9 @@
 
   #@DESCRIPTION: Machine configuration for Intel 1-N450 based systems
 
+PREFERRED_PROVIDER-virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "3.2%"
+
   require conf/machine/include/tune-atom.inc
   require conf/machine/include/ia32-base.inc
 
meta-n450/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend new file +10 -0
new file mode 100644
index 0000000..1c7fef9
@@ -0,0 +1,10 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+COMPATIBLE_MACHINE_n450 = "n450"
+KMACHINE_n450 = "atom-pc"
+
+KERNEL_FEATURES_append_n450 += " cfg/smp.scc"
+
+# Update the following to use a different BSP branch or meta SRCREV
+#KBRANCH_n450 = "yocto/standard/preempt-rt/base"
+#SRCREV_machine_pn-linux-yocto-rt_n450 ?= XXXX
+#SRCREV_meta_pn-linux-yocto-rt_n450 ?= XXXX
meta-n450/recipes-kernel/linux/linux-yocto_3.2.bbappend new file +0 -0
new file mode 100644
index 0000000..f02c475

meta-n450/recipes-kernel/linux/linux-yocto_3.2.bbappend line 7

Quoted 7 lines
meta-n450/recipes-kernel/linux/linux-yocto_3.2.bbappend new file +7 -0
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+COMPATIBLE_MACHINE_n450 = "n450"
+KMACHINE_n450  = "atom-pc"
+KBRANCH_n450 = "standard/default/common-pc/base"
+
+#SRCREV_machine_pn-linux-yocto_n450 = XXXX
+#SRCREV_meta_pn-linux-yocto_n450 ?= XXXX

_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto

#8 lore raw

PATCH 4/7 sys940x: prefer xf86-input-evdev 2.6.0

In reply to Darren Hart

Per the following commit, sys940x also uses emgd and requires the same treatment.

commit b612c79f600b7e904aeab37df5aaa3ca5d306b4d
Author: Richard Purdie <[email protected]>
Date: Wed Apr 25 21:15:06 2012 +0100

common/meta-graphics: Add xf86-input-evdev 2.6.0

This is needed by the pvr graphics stacks since newer versions won't build with the older xserver those platforms are using.

---
 meta-sys940x/conf/machine/sys940x.conf |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
meta-sys940x/conf/machine/sys940x.conf +1 -0
index 2315564..7123653 100644
@@ -17,6 +17,7 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
 
 PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
 PREFERRED_VERSION_mesa-dri ?= "7.11"
+PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
 PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
 
 SERIAL_CONSOLE = "115200 ttyS0"
Signature · 1 line
1.7.7.6
#9 lore raw

PATCH 5/7 sys940x: Add product URL to README

In reply to Darren Hart

Add the Inforce Computing website product URL for the SYS940X reference plaform to the sys940x bsp README.

---
 meta-sys940x/README |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
meta-sys940x/README +3 -0
index e349008..b030faf 100644
@@ -9,6 +9,9 @@ processor, plus the Intel EG20T Platform Controller Hub (Tunnel Creek
 It also supports the E6xx embedded on-chip graphics via the Intel
 Embedded Media and Graphics Driver (EMGD) 1.10 Driver.
 
+More details available on the product page:
+http://www.inforcecomputing.com/SYS940X_ECX.html
+
 
 Dependencies
 ============
Signature · 1 line
1.7.7.6
#10 lore raw

PATCH 6/7 ia32-base.inc: Use a weak default assignment for kernel provider and version

In reply to Darren Hart

Using the default assignment operator (?=) requires the including recipes to ensure to assign the Linux kernel provider and version prior to including ia32-base.inc. By use the weak default assignment operator (??=), the assignment can come after the inclusion, which avoids confusion and can lead to a more natural recipe structure.

---
 conf/machine/include/ia32-base.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
conf/machine/include/ia32-base.inc +2 -2
index 874e258..be1c8e0 100644
@@ -26,8 +26,8 @@ GLIBC_EXTRA_OECONF += "--with-tls"
 #
 # kernel-related variables
 #
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.0%"
+PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ??= "3.0%"
 
 #
 # XSERVER subcomponents, used to build the XSERVER variable
Signature · 1 line
1.7.7.6
Acked-by on v1 6/7
#11 lore raw

Re: [PATCH 6/7] ia32-base.inc: Use a weak default assignment for kernel provider and version

Quoted 7 lines · Darren Hart

Using the default assignment operator (?=) requires the including recipes to ensure to assign the Linux kernel provider and version prior to including ia32-base.inc. By use the weak default assignment operator (??=), the assignment can come after the inclusion, which avoids confusion and can lead to a more natural recipe structure.

Quoted 19 lines
---
 conf/machine/include/ia32-base.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
conf/machine/include/ia32-base.inc +2 -2
index 874e258..be1c8e0 100644
@@ -26,8 +26,8 @@ GLIBC_EXTRA_OECONF += "--with-tls"
 #
 # kernel-related variables
 #
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "3.0%"
+PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ??= "3.0%"
 
 #
 # XSERVER subcomponents, used to build the XSERVER variable
#12 lore raw

PATCH 7/7 sys940x: Update to linux-yocto 3.2

In reply to Darren Hart

Prefer the 3.2 version of linux-yocto.

---
 meta-sys940x/conf/machine/sys940x-noemgd.conf      |    2 ++
 meta-sys940x/conf/machine/sys940x.conf             |    2 ++
 .../linux/linux-yocto-rt_3.2.bbappend              |   12 ++++++++++++
 .../recipes-kernel/linux/linux-yocto_3.2.bbappend  |   15 +++++++++++++++
 4 files changed, 31 insertions(+), 0 deletions(-)
 create mode 100644 meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend
 create mode 100644 meta-sys940x/recipes-kernel/linux/linux-yocto_3.2.bbappend
meta-sys940x/conf/machine/sys940x-noemgd.conf +2 -0
index 537e419..23ec0bc 100644
@@ -10,6 +10,8 @@ require conf/machine/include/ia32-base.inc
 # Add "pcbios" if you have a non-efi version of the firmware
 MACHINE_FEATURES += "efi pcbios"
 
+PREFERRED_VERSION_linux-yocto ?= "3.2%"
+
 XSERVER ?= "${XSERVER_IA32_BASE} \
            ${XSERVER_IA32_EXT} \
            ${XSERVER_IA32_VESA} \
meta-sys940x/conf/machine/sys940x.conf +2 -0
index 7123653..4b9b91d 100644
@@ -10,6 +10,8 @@ require conf/machine/include/ia32-base.inc
 # Add "pcbios" if you have a non-efi version of the firmware
 MACHINE_FEATURES += "efi pcbios"
 
+PREFERRED_VERSION_linux-yocto ?= "3.2%"
+
 XSERVER ?= "${XSERVER_IA32_BASE} \
            ${XSERVER_IA32_EXT} \
            ${XSERVER_IA32_EMGD} \
meta-sys940x/recipes-kernel/linux/linux-yocto-rt_3.2.bbappend new file +12 -0
new file mode 100644
index 0000000..888bb98
@@ -0,0 +1,12 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+COMPATIBLE_MACHINE_sys940x = "sys940x"
+KMACHINE_sys940x = "sys940x"
+
+COMPATIBLE_MACHINE_sys940x-noemgd = "sys940x-noemgd"
+KMACHINE_sys940x-noemgd = "sys940x"
+
+# Update the following to use a different BSP branch or meta SRCREV
+#KBRANCH_sys940x = "yocto/standard/preempt-rt/base"
+#SRCREV_machine_pn-linux-yocto-rt_sys940x ?= XXXX
+#SRCREV_meta_pn-linux-yocto-rt_sys940x ?= XXXX
meta-sys940x/recipes-kernel/linux/linux-yocto_3.2.bbappend new file +15 -0
new file mode 100644
index 0000000..98d6562
@@ -0,0 +1,15 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+
+COMPATIBLE_MACHINE_sys940x = "sys940x"
+KMACHINE_sys940x  = "sys940x"
+KBRANCH_sys940x = "standard/default/base"
+
+COMPATIBLE_MACHINE_sys940x-noemgd = "sys940x-noemgd"
+KMACHINE_sys940x-noemgd  = "sys940x"
+KBRANCH_sys940x-noemgd = "standard/default/base"
+
+#SRCREV_machine_pn-linux-yocto_sys940x ?= "5df0b4c2538399aed543133b3855f809adf08ab8"
+#SRCREV_meta_pn-linux-yocto_sys940x ?= "77ca4855e80acb8dad21acea946908716c308b5b"
+#SRCREV_machine_pn-linux-yocto_sys940x-noemgd ?= "5df0b4c2538399aed543133b3855f809adf08ab8"
+#SRCREV_meta_pn-linux-yocto_sys940x-noemgd ?= "77ca4855e80acb8dad21acea946908716c308b5b"
Signature · 1 line
1.7.7.6
#13 lore raw

[PATCH 8/7] sys940x: Drop PREFERRED_VERSION for emgd driver

In reply to Darren Hart

[and one more, also now on the contrib branch mentioned in 0/1]

Accept the default version of the emgd driver, 1.8 is no longer available anyway. This avoids the warning about 1.8 not being available.

---
 meta-sys940x/conf/machine/sys940x.conf |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
meta-sys940x/conf/machine/sys940x.conf +0 -1
index 4b9b91d..58e2ba1 100644
@@ -20,7 +20,6 @@ XSERVER ?= "${XSERVER_IA32_BASE} \
 PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
 PREFERRED_VERSION_mesa-dri ?= "7.11"
 PREFERRED_VERSION_xf86-input-evdev ?= "2.6.0"
-PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 APPEND += "console=ttyS0,115200 console=tty0"