Skip to content

Commit ea5ec8d

Browse files
committed
qemu: bump to 4.0.0 release
Updated nios2 patch to build with qemu 4.0.0 Signed-off-by: Kumar Gala <[email protected]>
1 parent 676e1ec commit ea5ec8d

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
From 50a5a7b223f7c447a0e1d0f56a2da4a8459a7f2e Mon Sep 17 00:00:00 2001
1+
From 1c7173de9571f2bdb4052bc7407aa16609e8055f Mon Sep 17 00:00:00 2001
22
From: Ramakrishna Pallala <[email protected]>
3-
Date: Fri, 14 Sep 2018 20:35:05 +0530
3+
Date: Fri, 17 May 2019 10:15:15 -0500
44
Subject: [PATCH] qemu/nios2: Add Altera MAX 10 board support for Zephyr OS
55

66
Exisitng 10m50_devboard is not supporting qemu-niso2 on Zephyr OS
@@ -12,20 +12,21 @@ So added support for Zephyr qemu-nios2 board.
1212
Signed-off-by: Ramakrishna Pallala <[email protected]>
1313
---
1414
hw/nios2/Makefile.objs | 2 +-
15-
hw/nios2/altera_10m50_zephyr.c | 163 +++++++++++++++++++++++++++++++++++++++++
15+
hw/nios2/altera_10m50_zephyr.c | 163 +++++++++++++++++++++++++++++++++
1616
2 files changed, 164 insertions(+), 1 deletion(-)
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 6b5c421..6723586 100644
20+
index 89a419a9f5..07b6eb0a66 100644
2121
--- a/hw/nios2/Makefile.objs
2222
+++ b/hw/nios2/Makefile.objs
23-
@@ -1 +1 @@
24-
-obj-y = boot.o cpu_pic.o 10m50_devboard.o
25-
+obj-y = boot.o cpu_pic.o 10m50_devboard.o altera_10m50_zephyr.o
23+
@@ -1,2 +1,2 @@
24+
obj-y = boot.o cpu_pic.o
25+
-obj-$(CONFIG_NIOS2_10M50) += 10m50_devboard.o
26+
+obj-$(CONFIG_NIOS2_10M50) += 10m50_devboard.o altera_10m50_zephyr.o
2627
diff --git a/hw/nios2/altera_10m50_zephyr.c b/hw/nios2/altera_10m50_zephyr.c
2728
new file mode 100644
28-
index 0000000..91ec9d7
29+
index 0000000000..a3329a9288
2930
--- /dev/null
3031
+++ b/hw/nios2/altera_10m50_zephyr.c
3132
@@ -0,0 +1,163 @@
@@ -159,7 +160,7 @@ index 0000000..91ec9d7
159160
+ uint64_t entry;
160161
+
161162
+ /* Boots a kernel elf binary. */
162-
+ kernel_size = load_elf(kernel_filename, NULL, NULL,
163+
+ kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
163164
+ &entry, NULL, NULL,
164165
+ 0, EM_ALTERA_NIOS2, 0, 0);
165166
+
@@ -193,5 +194,5 @@ index 0000000..91ec9d7
193194
+
194195
+DEFINE_MACHINE("altera_10m50_zephyr", altera_10m50_zephyr_machine_init)
195196
--
196-
2.9.5
197+
2.20.1
197198

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ DEPENDS = "glib-2.0 zlib pixman gnutls dtc"
33
LICENSE = "GPLv2"
44
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
55
LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
6-
file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
6+
file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f"
77

8-
SRCREV = "32a1a94dd324d33578dca1dc96d7896a0244d768"
8+
SRCREV = "131b9a05705636086699df15d4a6d328bb2585e8"
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
"
@@ -198,7 +198,7 @@ QEMU_FLAGS = "--disable-docs --disable-sdl --disable-debug-info --disable-cap-
198198
--disable-libnfs --disable-libusb --disable-libiscsi --disable-usb-redir --disable-linux-aio\
199199
--disable-guest-agent --disable-libssh2 --disable-vnc-png --disable-seccomp \
200200
--disable-tpm --disable-numa --disable-glusterfs \
201-
--disable-virtfs --disable-xen --disable-curl --disable-attr --disable-curses\
201+
--disable-virtfs --disable-xen --disable-curl --disable-attr --disable-curses --disable-iconv \
202202
"
203203

204204
do_configure() {

0 commit comments

Comments
 (0)