Add nios2 qemu target since nios2 is now supported in mainline. Signed-off-by: Marek Vasut <ma...@denx.de> Cc: Richard Purdie <richard.pur...@linuxfoundation.org> Cc: Ross Burton <ross.bur...@intel.com> --- meta-poky/conf/distro/poky.conf | 3 ++- meta/recipes-devtools/qemu/qemu.inc | 2 +- scripts/runqemu | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/meta-poky/conf/distro/poky.conf b/meta-poky/conf/distro/poky.conf index 57b7e71d5f..d262f572ad 100644 --- a/meta-poky/conf/distro/poky.conf +++ b/meta-poky/conf/distro/poky.conf @@ -39,13 +39,14 @@ POKYQEMUDEPS = "${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPL-3.0", "", "pac DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}" DISTRO_EXTRA_RDEPENDS_append_qemuarm64 = " ${POKYQEMUDEPS}" DISTRO_EXTRA_RDEPENDS_append_qemumips = " ${POKYQEMUDEPS}" +DISTRO_EXTRA_RDEPENDS_append_qemunios2 = " ${POKYQEMUDEPS}" DISTRO_EXTRA_RDEPENDS_append_qemuppc = " ${POKYQEMUDEPS}" DISTRO_EXTRA_RDEPENDS_append_qemux86 = " ${POKYQEMUDEPS}" DISTRO_EXTRA_RDEPENDS_append_qemux86-64 = " ${POKYQEMUDEPS}" TCLIBCAPPEND = "" -QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el ppc x86_64" +QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el nios2 ppc x86_64" # Other QEMU_TARGETS "sh4" PREMIRRORS ??= "\ diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 0e1411af64..c9ac56121f 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -9,7 +9,7 @@ inherit autotools pkgconfig bluetooth BBCLASSEXTEND = "native nativesdk" # QEMU_TARGETS is overridable variable -QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el ppc sh4 x86_64" +QEMU_TARGETS ?= "arm aarch64 i386 mips mipsel mips64 mips64el nios2 ppc sh4 x86_64" EXTRA_OECONF = " \ --prefix=${prefix} \ diff --git a/scripts/runqemu b/scripts/runqemu index f0ddeea1bf..f4f1bba17d 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -1018,7 +1018,7 @@ class BaseConfig(object): """attempt to determine the appropriate qemu-system binary""" mach = self.get('MACHINE') if not mach: - search = '.*(qemux86-64|qemux86|qemuarm64|qemuarm|qemumips64|qemumips64el|qemumipsel|qemumips|qemuppc).*' + search = '.*(qemux86-64|qemux86|qemuarm64|qemuarm|qemumips64|qemumips64el|qemumipsel|qemumips|qemunios2|qemuppc).*' if self.rootfs: match = re.match(search, self.rootfs) if match: @@ -1049,6 +1049,8 @@ class BaseConfig(object): qbsys = 'mipsel' elif mach == 'qemumips64el': qbsys = 'mips64el' + elif mach == 'qemunios2': + qbsys = 'nios2' return 'qemu-system-%s' % qbsys -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core