Add linux-yocto-rt_3.0 support to all BSPs

PATCH In review Darren Hart 2 participants 4 messages Aug 11, 2011 – Aug 12, 2011

Share & tools

Darren Hart

author

2011-08-11 23:09 UTC #0 lore raw

cover Add linux-yocto-rt_3.0 support to all BSPs

This patch series adds the necessary linux-yocto-rt bbappend files for each BSP. It also conditionally sets the kernel provider and version so they can be overriden by the user or a layer.

All the BSPs are known to build the rt kernel. The n450, atom-pc, and crownbay are known to boot and run cyclictest using the core-image-rt image.

The following changes since commit 58f707b29e20c2f1712da2e0c1eedc78ea7de6c8:

meta-fishriver: switch to linux-yocto 3.0 kernel (2011-08-08 13:15:52 -0500)

are available in the git repository at:
git://git.pokylinux.org/meta-intel dvhart/rt
http://git.pokylinux.org/cgit.cgi/meta-intel/log/?h=dvhart/rt

Darren Hart (2):
add linux-yocto-rt_3.0 support for all meta-intel BSPs allow override of kernel provider

 meta-crownbay/conf/machine/crownbay-noemgd.conf    |    2 +-
 meta-crownbay/conf/machine/crownbay.conf           |    2 +-
 .../linux/linux-yocto-rt_3.0.bbappend              |    9 +++++++++
 meta-emenlow/conf/machine/emenlow.conf             |    2 +-
 .../linux/linux-yocto-rt_3.0.bbappend              |    7 +++++++
 meta-fishriver/conf/machine/fishriver.conf         |    5 ++---
 .../linux/linux-yocto-rt_3.0.bbappend              |    7 +++++++
 meta-fri2/conf/machine/fri2.conf                   |    4 ++--
 .../linux/linux-yocto-rt_3.0.bbappend              |    7 +++++++
 meta-jasperforest/conf/machine/jasperforest.conf   |    4 ++--
 .../linux/linux-yocto-rt_3.0.bbappend              |    7 +++++++
 .../linux/linux-yocto-rt_3.0.bbappend              |    9 +++++++++
 meta-sugarbay/conf/machine/sugarbay.conf           |    2 +-
 .../linux/linux-yocto-rt_3.0.bbappend              |    7 +++++++
 14 files changed, 63 insertions(+), 11 deletions(-)
 create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
 create mode 100644 meta-emenlow/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
 create mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
 create mode 100644 meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
 create mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
 create mode 100644 meta-n450/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
 create mode 100644 meta-sugarbay/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend

Signature · 1 line

1.7.6

Darren Hart

author

2011-08-11 23:09 UTC #1 lore raw

PATCH 1/2 add linux-yocto-rt_3.0 support for all meta-intel BSPs

All the BSPs build out of the preempt-rt/base branch (rather than a preempt-rt/$MACHINE branch), so separate KMACHINE and KBRANCH assignments are required for each BSP.

Signed-off-by Darren Hart <[email protected]>

---
 .../linux/linux-yocto-rt_3.0.bbappend              |    9 +++++++++
 .../linux/linux-yocto-rt_3.0.bbappend              |    7 +++++++
 .../linux/linux-yocto-rt_3.0.bbappend              |    7 +++++++
 .../linux/linux-yocto-rt_3.0.bbappend              |    7 +++++++
 .../linux/linux-yocto-rt_3.0.bbappend              |    7 +++++++
 .../linux/linux-yocto-rt_3.0.bbappend              |    9 +++++++++
 .../linux/linux-yocto-rt_3.0.bbappend              |    7 +++++++
 7 files changed, 53 insertions(+), 0 deletions(-)
 create mode 100644 meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
 create mode 100644 meta-emenlow/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
 create mode 100644 meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
 create mode 100644 meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
 create mode 100644 meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
 create mode 100644 meta-n450/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
 create mode 100644 meta-sugarbay/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend

meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend new file +9 -0

new file mode 100644
index 0000000..c257703
@@ -0,0 +1,9 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
+KMACHINE_crownbay-noemgd = "crownbay"
+KBRANCH_crownbay-noemgd = "yocto/standard/preempt-rt/base"
+
+KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc"
+
+SRCREV_machine_pn-linux-yocto-rt_crownbay-noemgd ?= ${AUTOREV}
+SRCREV_meta_pn-linux-yocto-rt_crownbay-noemgd ?= ${AUTOREV}

meta-emenlow/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend new file +7 -0

new file mode 100644
index 0000000..fbff72d
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+COMPATIBLE_MACHINE_emenlow = "emenlow"
+KMACHINE_emenlow  = "emenlow"
+KBRANCH_emenlow  = "yocto/standard/preempt-rt/base"
+
+SRCREV_machine_pn-linux-yocto-rt_emenlow ?= ${AUTOREV}
+SRCREV_meta_pn-linux-yocto-rt_emenlow ?= ${AUTOREV}

meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend new file +7 -0

new file mode 100644
index 0000000..4b1a2e1
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+COMPATIBLE_MACHINE_fishriver = "fishriver"
+KMACHINE_fishriver  = "fishriver"
+KBRANCH_fishriver  = "yocto/standard/preempt-rt/base"
+
+SRCREV_machine_pn-linux-yocto-rt_fishriver ?= ${AUTOREV}
+SRCREV_meta_pn-linux-yocto-rt_fishriver ?= ${AUTOREV}

meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend new file +7 -0

new file mode 100644
index 0000000..13b68a3
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+COMPATIBLE_MACHINE_fri2 = "fri2"
+KMACHINE_fri2 = "fri2"
+KBRANCH_fri2 = "yocto/standard/preempt-rt/base"
+
+SRCREV_machine_pn-linux-yocto-rt_fri2 ?= ${AUTOREV}
+SRCREV_meta_pn-linux-yocto-rt_fri2 ?= ${AUTOREV}

meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend new file +7 -0

new file mode 100644
index 0000000..ac18db0
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+COMPATIBLE_MACHINE_jasperforest = "jasperforest"
+KMACHINE_jasperforest  = "jasperforest"
+KBRANCH_jasperforest  = "yocto/standard/preempt-rt/base"
+
+SRCREV_machine_pn-linux-yocto-rt_jasperforest ?= ${AUTOREV}
+SRCREV_meta_pn-linux-yocto-rt_jasperforest ?= ${AUTOREV}

meta-n450/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend new file +9 -0

new file mode 100644
index 0000000..69e9304
@@ -0,0 +1,9 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+COMPATIBLE_MACHINE_n450 = "n450"
+KMACHINE_n450 = "atom-pc"
+KBRANCH_n450 = "yocto/standard/preempt-rt/base"
+
+KERNEL_FEATURES_append_n450 += " cfg/smp.scc"
+
+SRCREV_machine_pn-linux-yocto-rt_n450 ?= ${AUTOREV}
+SRCREV_meta_pn-linux-yocto-rt_n450 ?= ${AUTOREV}

meta-sugarbay/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend new file +7 -0

new file mode 100644
index 0000000..7564367
@@ -0,0 +1,7 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+COMPATIBLE_MACHINE_sugarbay = "sugarbay"
+KMACHINE_sugarbay  = "sugarbay"
+KBRANCH_sugarbay  = "yocto/standard/preempt-rt/base"
+
+SRCREV_machine_pn-linux-yocto-rt_sugarbay ?= ${AUTOREV}
+SRCREV_meta_pn-linux-yocto-rt_sugarbay ?= ${AUTOREV}

Signature · 1 line

1.7.6

Darren Hart

author

2011-08-11 23:09 UTC #2 lore raw

PATCH 2/2 allow override of kernel provider

In reply to Darren Hart

Allow users or layers to override PREFERRED_PROVIDER_virtual/kernel. This is required to use the linux-yocto-rt kernel, for example.

Signed-off-by Darren Hart <[email protected]>

---
 meta-crownbay/conf/machine/crownbay-noemgd.conf  |    2 +-
 meta-crownbay/conf/machine/crownbay.conf         |    2 +-
 meta-emenlow/conf/machine/emenlow.conf           |    2 +-
 meta-fishriver/conf/machine/fishriver.conf       |    5 ++---
 meta-fri2/conf/machine/fri2.conf                 |    4 ++--
 meta-jasperforest/conf/machine/jasperforest.conf |    4 ++--
 meta-sugarbay/conf/machine/sugarbay.conf         |    2 +-
 7 files changed, 10 insertions(+), 11 deletions(-)

meta-crownbay/conf/machine/crownbay-noemgd.conf +1 -1

index 7b8a7f2..0219bd1 100644
@@ -11,7 +11,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
 
 KERNEL_IMAGETYPE = "bzImage"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"

meta-crownbay/conf/machine/crownbay.conf +1 -1

index fd53dbb..323c8c1 100644
@@ -11,7 +11,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
 
 KERNEL_IMAGETYPE = "bzImage"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"

meta-emenlow/conf/machine/emenlow.conf +1 -1

index 21b314f..de6794e 100644
@@ -11,7 +11,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
 
 KERNEL_IMAGETYPE = "bzImage"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_libdrm = "libdrm-poulsbo"
 PREFERRED_PROVIDER_drm = "libdrm-poulsbo"

meta-fishriver/conf/machine/fishriver.conf +2 -3

index a44d896..70dcc2f 100644
@@ -11,9 +11,8 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
 
 KERNEL_IMAGETYPE = "bzImage"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
-PREFERRED_VERSION_linux-yocto = "3.0+git%"
-
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "3.0+git%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
 PREFERRED_PROVIDER_virtual/libgl  ?= "mesa-dri"

meta-fri2/conf/machine/fri2.conf +2 -2

index 6b25a51..fea43a2 100644
@@ -11,8 +11,8 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
 
 KERNEL_IMAGETYPE = "bzImage"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
-PREFERRED_VERSION_linux-yocto = "3.0+git%"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "3.0+git%"
 
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"

meta-jasperforest/conf/machine/jasperforest.conf +2 -2

index 89626da..6c44fe5 100644
@@ -11,8 +11,8 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
 
 KERNEL_IMAGETYPE = "bzImage"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
-PREFERRED_VERSION_linux-yocto = "3.0+git%"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
+PREFERRED_VERSION_linux-yocto ?= "3.0+git%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
 
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"

meta-sugarbay/conf/machine/sugarbay.conf +1 -1

index 0d1ab06..a6f6ddf 100644
@@ -11,7 +11,7 @@ MACHINE_FEATURES = "kernel26 screen keyboard pci usbhost ext2 ext3 x86 \
 
 KERNEL_IMAGETYPE = "bzImage"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
 PREFERRED_VERSION_linux-yocto = "3.0+git%"
 PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"

Signature · 1 line

1.7.6

Darren Hart

2011-08-12 14:31 UTC #3 lore raw

Re: [PATCH 3/2] rt: simplify linux-yocto-rt.bbappend for all BSPs

In reply to Darren Hart

[rather than rebase, I've added this one to the series, here for review
as well]

As the all the BSPs use the same BSP branch and meta commit ID as the base recipe, there is no need specify the KBRANCH and SRCREVs. Not doing so greatly simplifies maintenance. Leaving the syntax in place, but commented out, serves as documentation should the need arise to use a different BSP branch or meta commit ID.

Signed-off-by Darren Hart <[email protected]>

---
 .../linux/linux-yocto-rt_3.0.bbappend              |    7 ++++---
 .../linux/linux-yocto-rt_3.0.bbappend              |    7 ++++---
 .../linux/linux-yocto-rt_3.0.bbappend              |    7 ++++---
 .../linux/linux-yocto-rt_3.0.bbappend              |    7 ++++---
 .../linux/linux-yocto-rt_3.0.bbappend              |    7 ++++---
 .../linux/linux-yocto-rt_3.0.bbappend              |    7 ++++---
 .../linux/linux-yocto-rt_3.0.bbappend              |    7 ++++---
 7 files changed, 28 insertions(+), 21 deletions(-)

meta-crownbay/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend +4 -3

index c257703..aaf5614 100644
@@ -1,9 +1,10 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 COMPATIBLE_MACHINE_crownbay-noemgd = "crownbay-noemgd"
 KMACHINE_crownbay-noemgd = "crownbay"
-KBRANCH_crownbay-noemgd = "yocto/standard/preempt-rt/base"
 
 KERNEL_FEATURES_append_crownbay-noemgd += " cfg/smp.scc"
 
-SRCREV_machine_pn-linux-yocto-rt_crownbay-noemgd ?= ${AUTOREV}
-SRCREV_meta_pn-linux-yocto-rt_crownbay-noemgd ?= ${AUTOREV}
+# Update the following to use a different BSP branch or meta SRCREV
+#KBRANCH_crownbay-noemgd = "yocto/standard/preempt-rt/base"
+#SRCREV_machine_pn-linux-yocto-rt_crownbay-noemgd ?= XXXX
+#SRCREV_meta_pn-linux-yocto-rt_crownbay-noemgd ?= XXXX

meta-emenlow/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend +4 -3

index fbff72d..fce01cb 100644
@@ -1,7 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 COMPATIBLE_MACHINE_emenlow = "emenlow"
 KMACHINE_emenlow  = "emenlow"
-KBRANCH_emenlow  = "yocto/standard/preempt-rt/base"
 
-SRCREV_machine_pn-linux-yocto-rt_emenlow ?= ${AUTOREV}
-SRCREV_meta_pn-linux-yocto-rt_emenlow ?= ${AUTOREV}
+# Update the following to use a different BSP branch or meta SRCREV
+#KBRANCH_emenlow  = "yocto/standard/preempt-rt/base"
+#SRCREV_machine_pn-linux-yocto-rt_emenlow ?= XXXX
+#SRCREV_meta_pn-linux-yocto-rt_emenlow ?= XXXX

meta-fishriver/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend +4 -3

index 4b1a2e1..7a502bd 100644
@@ -1,7 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 COMPATIBLE_MACHINE_fishriver = "fishriver"
 KMACHINE_fishriver  = "fishriver"
-KBRANCH_fishriver  = "yocto/standard/preempt-rt/base"
 
-SRCREV_machine_pn-linux-yocto-rt_fishriver ?= ${AUTOREV}
-SRCREV_meta_pn-linux-yocto-rt_fishriver ?= ${AUTOREV}
+# Update the following to use a different BSP branch or meta SRCREV
+#KBRANCH_fishriver  = "yocto/standard/preempt-rt/base"
+#SRCREV_machine_pn-linux-yocto-rt_fishriver ?= XXXX
+#SRCREV_meta_pn-linux-yocto-rt_fishriver ?= XXXX

meta-fri2/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend +4 -3

index 13b68a3..2624176 100644
@@ -1,7 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 COMPATIBLE_MACHINE_fri2 = "fri2"
 KMACHINE_fri2 = "fri2"
-KBRANCH_fri2 = "yocto/standard/preempt-rt/base"
 
-SRCREV_machine_pn-linux-yocto-rt_fri2 ?= ${AUTOREV}
-SRCREV_meta_pn-linux-yocto-rt_fri2 ?= ${AUTOREV}
+# Update the following to use a different BSP branch or meta SRCREV
+#KBRANCH_fri2 = "yocto/standard/preempt-rt/base"
+#SRCREV_machine_pn-linux-yocto-rt_fri2 ?= XXXX
+#SRCREV_meta_pn-linux-yocto-rt_fri2 ?= XXXX

meta-jasperforest/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend +4 -3

index ac18db0..1ddc78f 100644
@@ -1,7 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 COMPATIBLE_MACHINE_jasperforest = "jasperforest"
 KMACHINE_jasperforest  = "jasperforest"
-KBRANCH_jasperforest  = "yocto/standard/preempt-rt/base"
 
-SRCREV_machine_pn-linux-yocto-rt_jasperforest ?= ${AUTOREV}
-SRCREV_meta_pn-linux-yocto-rt_jasperforest ?= ${AUTOREV}
+# Update the following to use a different BSP branch or meta SRCREV
+#KBRANCH_jasperforest  = "yocto/standard/preempt-rt/base"
+#SRCREV_machine_pn-linux-yocto-rt_jasperforest ?= ${AUTOREV}
+#SRCREV_meta_pn-linux-yocto-rt_jasperforest ?= ${AUTOREV}

meta-n450/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend +4 -3

index 69e9304..1c7fef9 100644
@@ -1,9 +1,10 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 COMPATIBLE_MACHINE_n450 = "n450"
 KMACHINE_n450 = "atom-pc"
-KBRANCH_n450 = "yocto/standard/preempt-rt/base"
 
 KERNEL_FEATURES_append_n450 += " cfg/smp.scc"
 
-SRCREV_machine_pn-linux-yocto-rt_n450 ?= ${AUTOREV}
-SRCREV_meta_pn-linux-yocto-rt_n450 ?= ${AUTOREV}
+# 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-sugarbay/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend +4 -3

index 7564367..a63959c 100644
@@ -1,7 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 COMPATIBLE_MACHINE_sugarbay = "sugarbay"
 KMACHINE_sugarbay  = "sugarbay"
-KBRANCH_sugarbay  = "yocto/standard/preempt-rt/base"
 
-SRCREV_machine_pn-linux-yocto-rt_sugarbay ?= ${AUTOREV}
-SRCREV_meta_pn-linux-yocto-rt_sugarbay ?= ${AUTOREV}
+# Update the following to use a different BSP branch or meta SRCREV
+#KBRANCH_sugarbay  = "yocto/standard/preempt-rt/base"
+#SRCREV_machine_pn-linux-yocto-rt_sugarbay ?= XXXX
+#SRCREV_meta_pn-linux-yocto-rt_sugarbay ?= XXXX

Signature · 1 line

1.7.6