From 52ea026df141ea23bbab38ad3a9733c15097eaa4 Mon Sep 17 00:00:00 2001 From: Liming Wang Date: Wed, 4 Jan 2012 18:29:17 +0800 Subject: qemuppc: replace emulation of qemuppc from prep to mac99 With this new emulation, existing qemuppc functionality is maintained and other functionality such as framebuffer + sato and NFS boot are added. Signed-off-by: Liming Wang Signed-off-by: Bruce Ashfield --- meta/conf/machine/qemuppc.conf | 2 +- meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'meta') diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf index bcc408f4de..48eecb73b6 100644 --- a/meta/conf/machine/qemuppc.conf +++ b/meta/conf/machine/qemuppc.conf @@ -5,7 +5,7 @@ require conf/machine/include/qemu.inc require conf/machine/include/tune-ppc603e.inc -KERNEL_IMAGETYPE = "zImage" +KERNEL_IMAGETYPE = "vmlinux" SERIAL_CONSOLE = "115200 ttyS0" 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 c8983c405c..c6bf4465b2 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb @@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt" SRCREV_machine ?= "bcf4107c7f22d10952618a2ad146e6149d240cd2" SRCREV_machine_qemuppc ?= "1e5511ea2cb5f150ffce86071035a81c0499494b" -SRCREV_meta ?= "6ae3d992cf546184010e87a0349810198f1d167c" +SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4" PR = "r1" PV = "${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 921c258c63..e624b48bc2 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb @@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "10e808d1c304b14cf42903fd637f239766b78476" SRCREV_machine_qemux86 ?= "e04f9f8e564c60b1ce907d64074c18730f8dab4e" SRCREV_machine_qemux86-64 ?= "53c2fa060d34e9a0b59e19398aeebbe73f24d89b" SRCREV_machine ?= "fe80c1e343bf8f038328a612cef7f821d7ec8dbf" -SRCREV_meta ?= "6ae3d992cf546184010e87a0349810198f1d167c" +SRCREV_meta ?= "73dafd44ea875df654129b32b2877f342d5573e4" PR = "r2" PV = "${LINUX_VERSION}+git${SRCPV}" -- cgit v1.2.3