summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2013-03-26 14:46:38 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-26 17:50:09 (GMT)
commit27bc091173aa9fc3757e40fa3fd81b58c8eba0da (patch)
treeac59be3849bf647bb9b3882dcb7b63a42330c22f
parent64b3a377e8b8eff0d9421899081fd22d93b7ecde (diff)
downloadpoky-27bc091173aa9fc3757e40fa3fd81b58c8eba0da.tar.gz
linux-yocto/3.8: qemuarm boot fix
The preempt-rt kernel was wasn't inheriting the standard kernel configuration and hence was not able to boot on qemuarm due to missing ABI options. Changing the main preempt-rt kernel include to inherit standard configuration again fixes this boot issue. (From OE-Core rev: d569f44c296f6de1f7bb6ad9f581c237d5947321) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb6
-rw-r--r--meta/recipes-kernel/linux/linux-yocto_3.8.bb2
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb
index f12de2e..255e2e3 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.8.bb
@@ -8,9 +8,9 @@ LINUX_KERNEL_TYPE = "preempt-rt"
8 8
9KMETA = "meta" 9KMETA = "meta"
10 10
11SRCREV_machine ?= "d125901ac3e516e9b894df088f4282347651b690" 11SRCREV_machine ?= "f35992f80c81dc5fa1a97165dfd5cbb84661f7cb"
12SRCREV_machine_qemuppc ?= "66630413d6df1665f2c5c94d25eb409271ffe20c" 12SRCREV_machine_qemuppc ?= "5789e3f33c1d5df35ced60d0153cafca7cd0e319"
13SRCREV_meta ?= "2a6d36e75ca0a121570a389d7bab76ec240cbfda" 13SRCREV_meta ?= "1b534b2f8bbe9b8a773268cfa30a4850346f6f5f"
14 14
15PR = "${INC_PR}.0" 15PR = "${INC_PR}.0"
16PV = "${LINUX_VERSION}+git${SRCPV}" 16PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.8.bb b/meta/recipes-kernel/linux/linux-yocto_3.8.bb
index f2ad0e5..95a4906 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.8.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.8.bb
@@ -9,7 +9,7 @@ SRCREV_machine_qemuppc ?= "8844013c81e9ad80246aabca6573eed9dbaac646"
9SRCREV_machine_qemux86 ?= "15a0766b3d007e5fafce3503375694dff2b0603e" 9SRCREV_machine_qemux86 ?= "15a0766b3d007e5fafce3503375694dff2b0603e"
10SRCREV_machine_qemux86-64 ?= "15a0766b3d007e5fafce3503375694dff2b0603e" 10SRCREV_machine_qemux86-64 ?= "15a0766b3d007e5fafce3503375694dff2b0603e"
11SRCREV_machine ?= "15a0766b3d007e5fafce3503375694dff2b0603e" 11SRCREV_machine ?= "15a0766b3d007e5fafce3503375694dff2b0603e"
12SRCREV_meta ?= "2a6d36e75ca0a121570a389d7bab76ec240cbfda" 12SRCREV_meta ?= "1b534b2f8bbe9b8a773268cfa30a4850346f6f5f"
13 13
14SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta" 14SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.8.git;protocol=git;bareclone=1;branch=${KBRANCH},${KMETA};name=machine,meta"
15 15