Skip to content

Commit 0cd47bf

Browse files
committed
qemu: bump to 4.1.0-rc4 release
Signed-off-by: Kumar Gala <[email protected]>
1 parent 3502c8f commit 0cd47bf

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

meta-zephyr-sdk/recipes-devtools/qemu/files/0001-qemu-nios2-Add-Altera-MAX-10-board-support-for-Zephy.patch

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 1c7173de9571f2bdb4052bc7407aa16609e8055f Mon Sep 17 00:00:00 2001
1+
From 4f3b9e1e8a9c05f4e2bc1fba97d14784832b7f6b Mon Sep 17 00:00:00 2001
22
From: Ramakrishna Pallala <[email protected]>
33
Date: Fri, 17 May 2019 10:15:15 -0500
44
Subject: [PATCH] qemu/nios2: Add Altera MAX 10 board support for Zephyr OS
@@ -17,13 +17,14 @@ Signed-off-by: Ramakrishna Pallala <[email protected]>
1717
create mode 100644 hw/nios2/altera_10m50_zephyr.c
1818

1919
diff --git a/hw/nios2/Makefile.objs b/hw/nios2/Makefile.objs
20-
index 89a419a9f5..07b6eb0a66 100644
20+
index 3e017981ba..4b05c2aa7f 100644
2121
--- a/hw/nios2/Makefile.objs
2222
+++ b/hw/nios2/Makefile.objs
23-
@@ -1,2 +1,2 @@
23+
@@ -1,3 +1,3 @@
2424
obj-y = boot.o cpu_pic.o
2525
-obj-$(CONFIG_NIOS2_10M50) += 10m50_devboard.o
2626
+obj-$(CONFIG_NIOS2_10M50) += 10m50_devboard.o altera_10m50_zephyr.o
27+
obj-$(CONFIG_NIOS2_GENERIC_NOMMU) += generic_nommu.o
2728
diff --git a/hw/nios2/altera_10m50_zephyr.c b/hw/nios2/altera_10m50_zephyr.c
2829
new file mode 100644
2930
index 0000000000..a3329a9288

meta-zephyr-sdk/recipes-devtools/qemu/zephyr-qemu_git.bb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
55
LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
66
file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f"
77

8-
SRCREV = "131b9a05705636086699df15d4a6d328bb2585e8"
8+
SRCREV = "864ab314f1d924129d06ac7b571f105a2b76a4b2"
99
SRC_URI = "git://github.com/qemu/qemu.git;protocol=https \
1010
file://0001-qemu-nios2-Add-Altera-MAX-10-board-support-for-Zephy.patch \
1111
"
@@ -196,7 +196,7 @@ inherit autotools pkgconfig
196196
QEMUS_BUILT = "aarch64-softmmu arm-softmmu i386-softmmu mips-softmmu nios2-softmmu xtensa-softmmu riscv32-softmmu riscv64-softmmu x86_64-softmmu"
197197
QEMU_FLAGS = "--disable-docs --disable-sdl --disable-debug-info --disable-cap-ng \
198198
--disable-libnfs --disable-libusb --disable-libiscsi --disable-usb-redir --disable-linux-aio\
199-
--disable-guest-agent --disable-libssh2 --disable-vnc-png --disable-seccomp \
199+
--disable-guest-agent --disable-libssh --disable-vnc-png --disable-seccomp \
200200
--disable-tpm --disable-numa --disable-glusterfs \
201201
--disable-virtfs --disable-xen --disable-curl --disable-attr --disable-curses --disable-iconv \
202202
"

0 commit comments

Comments
 (0)