summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2012-06-07 15:59:46 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-08 11:56:31 +0100
commit9cf85014444a55ecfd2bd794ff267f68fa216928 (patch)
tree7c8186364190f9c2fb4d10081968bf79a3747576 /meta/recipes-kernel
parentb0789103afd51fb74b8dd47e0b5584f65c96b90c (diff)
downloadpoky-9cf85014444a55ecfd2bd794ff267f68fa216928.tar.gz
linux-yocto: add machine aliases for yocto BSPs
To avoid mapping machine names to kernel machine names in recipes, we can define multiple KMACHINE names for a single in tree board. This allows the tools to match a board description to multiple different MACHINEs. As a result, we can remove the explicit KMACHINE mappings from the linux-yocto recipes and allow the KMACHINE=${MACHINE} default to handle mappings. Individual recipes an bbappends can override this as required. (From OE-Core rev: d3dc05a4b808136876cb257a568737abfaceeadd) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb9
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb9
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb3
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.0.bb9
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.2.bb9
5 files changed, 5 insertions, 34 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
index 929aa8503a..508beb1768 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -1,13 +1,6 @@
1inherit kernel 1inherit kernel
2require recipes-kernel/linux/linux-yocto.inc 2require recipes-kernel/linux/linux-yocto.inc
3 3
4KMACHINE = "common-pc"
5KMACHINE_qemux86 = "common-pc"
6KMACHINE_qemux86-64 = "common-pc-64"
7KMACHINE_qemuarm = "arm-versatile-926ejs"
8KMACHINE_qemuppc = "qemu-ppc32"
9KMACHINE_qemumips = "mti-malta32-be"
10
11KBRANCH = "yocto/standard/preempt-rt/base" 4KBRANCH = "yocto/standard/preempt-rt/base"
12KBRANCH_qemuppc = "yocto/standard/preempt-rt/qemu-ppc32" 5KBRANCH_qemuppc = "yocto/standard/preempt-rt/qemu-ppc32"
13 6
@@ -17,7 +10,7 @@ KMETA = "meta"
17 10
18SRCREV_machine ?= "e67428d9966eecec4c081993dc64ceb5c0e64643" 11SRCREV_machine ?= "e67428d9966eecec4c081993dc64ceb5c0e64643"
19SRCREV_machine_qemuppc ?= "dcca458cb92cc287f70e4062f02460f36a881b16" 12SRCREV_machine_qemuppc ?= "dcca458cb92cc287f70e4062f02460f36a881b16"
20SRCREV_meta ?= "34e0d2b4b4e9778b31f9ea99ca43f0dc71a7ee23" 13SRCREV_meta ?= "b040132c19d70b00fc49f3b7e08c2ed52ac59f92"
21 14
22PR = "r2" 15PR = "r2"
23PV = "${LINUX_VERSION}+git${SRCPV}" 16PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
index f881c1f2f6..f27e39e73e 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
@@ -1,13 +1,6 @@
1inherit kernel 1inherit kernel
2require recipes-kernel/linux/linux-yocto.inc 2require recipes-kernel/linux/linux-yocto.inc
3 3
4KMACHINE = "common-pc"
5KMACHINE_qemux86 = "common-pc"
6KMACHINE_qemux86-64 = "common-pc-64"
7KMACHINE_qemuarm = "arm-versatile-926ejs"
8KMACHINE_qemuppc = "qemu-ppc32"
9KMACHINE_qemumips = "mti-malta32-be"
10
11KBRANCH = "standard/preempt-rt/base" 4KBRANCH = "standard/preempt-rt/base"
12KBRANCH_qemuppc = "standard/preempt-rt/qemu-ppc32" 5KBRANCH_qemuppc = "standard/preempt-rt/qemu-ppc32"
13 6
@@ -18,7 +11,7 @@ KMETA = "meta"
18 11
19SRCREV_machine ?= "fe2630b38159ea7b9cf977b5fed40a9917002087" 12SRCREV_machine ?= "fe2630b38159ea7b9cf977b5fed40a9917002087"
20SRCREV_machine_qemuppc ?= "0259e5a3ef568c6979f2cb31280a43c55c784f4f" 13SRCREV_machine_qemuppc ?= "0259e5a3ef568c6979f2cb31280a43c55c784f4f"
21SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235" 14SRCREV_meta ?= "0a18db9fc89a0e030e8c7b8d01fe03c5ca4197e3"
22 15
23PR = "r1" 16PR = "r1"
24PV = "${LINUX_VERSION}+git${SRCPV}" 17PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb
index 80be112ac3..81aefb169d 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.2.bb
@@ -4,7 +4,6 @@ require recipes-kernel/linux/linux-yocto.inc
4# We need lzma (as CONFIG_KERNEL_LZMA=y) 4# We need lzma (as CONFIG_KERNEL_LZMA=y)
5DEPENDS += "xz-native" 5DEPENDS += "xz-native"
6 6
7KMACHINE = "common-pc"
8KBRANCH = "standard/tiny" 7KBRANCH = "standard/tiny"
9LINUX_KERNEL_TYPE = "tiny" 8LINUX_KERNEL_TYPE = "tiny"
10KCONFIG_MODE = "--allnoconfig" 9KCONFIG_MODE = "--allnoconfig"
@@ -12,7 +11,7 @@ KCONFIG_MODE = "--allnoconfig"
12LINUX_VERSION ?= "3.2.18" 11LINUX_VERSION ?= "3.2.18"
13 12
14SRCREV_machine ?= "8b8cfaaab2b8d79ac56e8c9a85bad9ae7bca399c" 13SRCREV_machine ?= "8b8cfaaab2b8d79ac56e8c9a85bad9ae7bca399c"
15SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235" 14SRCREV_meta ?= "0a18db9fc89a0e030e8c7b8d01fe03c5ca4197e3"
16 15
17PR = "r0" 16PR = "r0"
18PV = "${LINUX_VERSION}+git${SRCPV}" 17PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index 0f1be83967..cfae247866 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -8,13 +8,6 @@ KBRANCH_qemuppc = "yocto/standard/qemu-ppc32"
8KBRANCH_qemumips = "yocto/standard/mti-malta32-be" 8KBRANCH_qemumips = "yocto/standard/mti-malta32-be"
9KBRANCH_qemuarm = "yocto/standard/arm-versatile-926ejs" 9KBRANCH_qemuarm = "yocto/standard/arm-versatile-926ejs"
10 10
11# Temporary until 3.0 kernel tree is updated with machine mappings
12KMACHINE_qemux86 = "common-pc"
13KMACHINE_qemux86-64 = "common-pc-64"
14KMACHINE_qemuppc = "qemu-ppc32"
15KMACHINE_qemumips = "mti-malta32-be"
16KMACHINE_qemuarm = "arm-versatile-926ejs"
17
18KMETA = "meta" 11KMETA = "meta"
19 12
20LINUX_VERSION ?= "3.0.32" 13LINUX_VERSION ?= "3.0.32"
@@ -25,7 +18,7 @@ SRCREV_machine_qemuppc ?= "bd9a3c4c066bd4b9f52b51aaaec9b029a7abe793"
25SRCREV_machine_qemux86 ?= "70342faea067476774eb55f4e3098af0bcc48782" 18SRCREV_machine_qemux86 ?= "70342faea067476774eb55f4e3098af0bcc48782"
26SRCREV_machine_qemux86-64 ?= "cba836a545fbeb96f6f2392c3ecbac9d7735fa65" 19SRCREV_machine_qemux86-64 ?= "cba836a545fbeb96f6f2392c3ecbac9d7735fa65"
27SRCREV_machine ?= "bd6ad607c754dea30d91502a237870b4c45e0f1b" 20SRCREV_machine ?= "bd6ad607c754dea30d91502a237870b4c45e0f1b"
28SRCREV_meta ?= "34e0d2b4b4e9778b31f9ea99ca43f0dc71a7ee23" 21SRCREV_meta ?= "b040132c19d70b00fc49f3b7e08c2ed52ac59f92"
29 22
30PR = "r4" 23PR = "r4"
31PV = "${LINUX_VERSION}+git${SRCPV}" 24PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.2.bb b/meta/recipes-kernel/linux/linux-yocto_3.2.bb
index 665ddca053..ac4e454702 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.2.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.2.bb
@@ -1,13 +1,6 @@
1inherit kernel 1inherit kernel
2require recipes-kernel/linux/linux-yocto.inc 2require recipes-kernel/linux/linux-yocto.inc
3 3
4KMACHINE = "common-pc"
5KMACHINE_qemux86 = "common-pc"
6KMACHINE_qemux86-64 = "common-pc-64"
7KMACHINE_qemuppc = "qemu-ppc32"
8KMACHINE_qemumips = "mti-malta32-be"
9KMACHINE_qemuarm = "arm-versatile-926ejs"
10
11KBRANCH = "standard/default/base" 4KBRANCH = "standard/default/base"
12KBRANCH_qemux86 = "standard/default/common-pc/base" 5KBRANCH_qemux86 = "standard/default/common-pc/base"
13KBRANCH_qemux86-64 = "standard/default/common-pc-64/base" 6KBRANCH_qemux86-64 = "standard/default/common-pc-64/base"
@@ -23,7 +16,7 @@ SRCREV_machine_qemuppc ?= "466746d1fe6370957ba087f9ca6f2e31201b2162"
23SRCREV_machine_qemux86 ?= "c228cadee60f0ada73d11a36f6932f50a1c52d48" 16SRCREV_machine_qemux86 ?= "c228cadee60f0ada73d11a36f6932f50a1c52d48"
24SRCREV_machine_qemux86-64 ?= "b95a0ae3773545fa0ed9a47088d0361527c42e6c" 17SRCREV_machine_qemux86-64 ?= "b95a0ae3773545fa0ed9a47088d0361527c42e6c"
25SRCREV_machine ?= "8b8cfaaab2b8d79ac56e8c9a85bad9ae7bca399c" 18SRCREV_machine ?= "8b8cfaaab2b8d79ac56e8c9a85bad9ae7bca399c"
26SRCREV_meta ?= "49f931bc294d5b6be60502bbd448cff5aa766235" 19SRCREV_meta ?= "0a18db9fc89a0e030e8c7b8d01fe03c5ca4197e3"
27 20
28PR = "r1" 21PR = "r1"
29PV = "${LINUX_VERSION}+git${SRCPV}" 22PV = "${LINUX_VERSION}+git${SRCPV}"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-14 17:37:46 +0000