summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend25
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.0.bbappend15
-rw-r--r--meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend14
-rw-r--r--meta-yocto/conf/distro/poky.conf10
4 files changed, 19 insertions, 45 deletions
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
deleted file mode 100644
index 274eb822ce..0000000000
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto-rt_3.0.bbappend
+++ /dev/null
@@ -1,25 +0,0 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2
3# atom-pc support
4COMPATIBLE_MACHINE_atom-pc = "atom-pc"
5KMACHINE_atom-pc = "atom-pc"
6KBRANCH_atom-pc = "yocto/standard/preempt-rt/base"
7SRCREV_machine_pn-linux-yocto-rt_atom-pc = "bbd5bfe49403fdcca294ca4b163d5f7195ea3a8e"
8
9# mpc8315e-rdb support
10COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
11KMACHINE_mpc8315e-rdb = "fsl-mpc8315e-rdb"
12KBRANCH_mpc8315e-rdb = "yocto/standard/preempt-rt/base"
13SRCREV_machine_pn-linux-yocto-rt_mpc8315e-rdb = "bbd5bfe49403fdcca294ca4b163d5f7195ea3a8e"
14
15# beagleboard support - 3.0 support has not yet been completed, build failure
16#COMPATIBLE_MACHINE_beagleboard = "beagleboard"
17#KMACHINE_beagleboard = "beagleboard"
18#KBRANCH_beagleboard = "yocto/standard/preempt-rt/base"
19#SRCREV_machine_pn-linux-yocto-rt_beagleboard =
20
21# routerstationpro support - preempt-rt kernel build failure
22COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
23KMACHINE_routerstationpro = "routerstationpro"
24KBRANCH_routerstationpro = "yocto/standard/preempt-rt/routerstationpro"
25SRCREV_machine_pn-linux-yocto-rt_routerstationpro = "634ba79510753eecd27a39a315f690f1c9d46efe"
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.0.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.0.bbappend
deleted file mode 100644
index 9641336cf6..0000000000
--- a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.0.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
1KBRANCH_atom-pc = "yocto/standard/common-pc/atom-pc"
2KBRANCH_routerstationpro = "yocto/standard/routerstationpro"
3KBRANCH_mpc8315e-rdb = "yocto/standard/fsl-mpc8315e-rdb"
4KBRANCH_beagleboard = "yocto/standard/beagleboard"
5
6SRCREV_machine_atom-pc ?= "834c2a69c87ee7211932f8ec5102a472828abcb1"
7SRCREV_machine_routerstationpro ?= "1c17c082b6ee565acc176cde5be835ac4269817b"
8SRCREV_machine_mpc8315e-rdb ?= "f2312437b52dda4499310aacb4c561ba8b8cbeb7"
9SRCREV_machine_beagleboard ?= "3ab688a78cac7b2e32afc83376a53370f2bd13b7"
10
11
12COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
13COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
14COMPATIBLE_MACHINE_beagleboard = "beagleboard"
15COMPATIBLE_MACHINE_atom-pc = "atom-pc"
diff --git a/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend
new file mode 100644
index 0000000000..479a3860b7
--- /dev/null
+++ b/meta-yocto-bsp/recipes-kernel/linux/linux-yocto_3.8.bbappend
@@ -0,0 +1,14 @@
1KBRANCH_atom-pc = "standard/common-pc/atom-pc"
2KBRANCH_routerstationpro = "standard/routerstationpro"
3KBRANCH_mpc8315e-rdb = "standard/fsl-mpc8315e-rdb"
4KBRANCH_beagleboard = "standard/beagleboard"
5
6#SRCREV_machine_atom-pc ?= "b170394a475b96ecc92cbc9e4b002bed0a9f69c5"
7#SRCREV_machine_routerstationpro ?= "b170394a475b96ecc92cbc9e4b002bed0a9f69c5"
8#SRCREV_machine_mpc8315e-rdb ?= "82bb8c34e0eb5e3d3b35d3c5631d9df147b659dd"
9#SRCREV_machine_beagleboard ?= "b170394a475b96ecc92cbc9e4b002bed0a9f69c5"
10
11COMPATIBLE_MACHINE_mpc8315e-rdb = "mpc8315e-rdb"
12COMPATIBLE_MACHINE_routerstationpro = "routerstationpro"
13COMPATIBLE_MACHINE_beagleboard = "beagleboard"
14COMPATIBLE_MACHINE_atom-pc = "atom-pc"
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index d924fcc996..85829f9055 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -14,11 +14,11 @@ LAYER_CONF_VERSION ?= "6"
14DISTRO_FEATURES_append = " largefile opengl multiarch" 14DISTRO_FEATURES_append = " largefile opengl multiarch"
15 15
16PREFERRED_VERSION_linux-yocto ?= "3.4%" 16PREFERRED_VERSION_linux-yocto ?= "3.4%"
17PREFERRED_VERSION_linux-yocto_qemux86 ?= "3.4%" 17PREFERRED_VERSION_linux-yocto_qemux86 ?= "3.8%"
18PREFERRED_VERSION_linux-yocto_qemux86-64 ?= "3.4%" 18PREFERRED_VERSION_linux-yocto_qemux86-64 ?= "3.8%"
19PREFERRED_VERSION_linux-yocto_qemuarm ?= "3.4%" 19PREFERRED_VERSION_linux-yocto_qemuarm ?= "3.8%"
20PREFERRED_VERSION_linux-yocto_qemumips ?= "3.4%" 20PREFERRED_VERSION_linux-yocto_qemumips ?= "3.8%"
21PREFERRED_VERSION_linux-yocto_qemuppc ?= "3.4%" 21PREFERRED_VERSION_linux-yocto_qemuppc ?= "3.8%"
22 22
23SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TARGET_ARCH}" 23SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${TARGET_ARCH}"
24SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}" 24SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"