qemu: Update to qemu 5.1

Signed-off-by: Kumar Gala <[email protected]>

Author: galak

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

@@ -1,7 +1,7 @@
-From e896d97b008901e79003fc9fb5acc20ba0a062f9 Mon Sep 17 00:00:00 2001
+From f5f10b5944a1e98d4f73521f7f2cc72319a5002a Mon Sep 17 00:00:00 2001
 From: Ramakrishna Pallala <[email protected]>
 Date: Fri, 17 May 2019 10:15:15 -0500
-Subject: [PATCH] qemu/nios2: Add Altera MAX 10 board support for Zephyr OS
+Subject: [PATCH 1/9] qemu/nios2: Add Altera MAX 10 board support for Zephyr OS
 
 Exisitng 10m50_devboard is not supporting qemu-niso2 on Zephyr OS
 and the reason might be that the softcpu build may be different
@@ -12,8 +12,8 @@ So added support for Zephyr qemu-nios2 board.
 Signed-off-by: Ramakrishna Pallala <[email protected]>
 ---
  hw/nios2/Makefile.objs         |   2 +-
- hw/nios2/altera_10m50_zephyr.c | 165 +++++++++++++++++++++++++++++++++
- 2 files changed, 166 insertions(+), 1 deletion(-)
+ hw/nios2/altera_10m50_zephyr.c | 164 +++++++++++++++++++++++++++++++++
+ 2 files changed, 165 insertions(+), 1 deletion(-)
  create mode 100644 hw/nios2/altera_10m50_zephyr.c
 
 diff --git a/hw/nios2/Makefile.objs b/hw/nios2/Makefile.objs
@@ -27,10 +27,10 @@ index 3e017981ba..4b05c2aa7f 100644
  obj-$(CONFIG_NIOS2_GENERIC_NOMMU) += generic_nommu.o
 diff --git a/hw/nios2/altera_10m50_zephyr.c b/hw/nios2/altera_10m50_zephyr.c
 new file mode 100644
-index 0000000000..d3cb558c19
+index 0000000000..c49adf7cc3
 --- /dev/null
 +++ b/hw/nios2/altera_10m50_zephyr.c
-@@ -0,0 +1,165 @@
+@@ -0,0 +1,164 @@
 +/*
 + * Copyright (c) 2018 Intel Corporation
 + *
@@ -115,9 +115,9 @@ index 0000000000..d3cb558c19
 +    MemoryRegion *ram = g_new(MemoryRegion, 1);
 +
 +    cpu = NIOS2_CPU(object_new(TYPE_NIOS2_CPU));
-+    object_property_set_bool(OBJECT(cpu), false, "mmu_present",
++    object_property_set_bool(OBJECT(cpu), "mmu_present", false,
 +                             &error_abort);
-+    object_property_set_bool(OBJECT(cpu), true, "realized", &error_abort);
++    object_property_set_bool(OBJECT(cpu), "realized", true, &error_abort);
 +
 +    machine_opts = qemu_get_machine_opts();
 +    kernel_filename = qemu_opt_get(machine_opts, "kernel");
@@ -133,10 +133,9 @@ index 0000000000..d3cb558c19
 +    cpu_irq = nios2_cpu_pic_init(cpu);
 +
 +    /* Register: Internal Interrupt Controller (IIC) */
-+    dev = qdev_create(NULL, "altera,iic");
-+    object_property_add_const_link(OBJECT(dev), "cpu", OBJECT(cpu),
-+                                   &error_abort);
-+    qdev_init_nofail(dev);
++    dev = qdev_new("altera,iic");
++    object_property_add_const_link(OBJECT(dev), "cpu", OBJECT(cpu));
++    sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
 +    sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, cpu_irq[0]);
 +    for (i = 0; i < 32; i++) {
 +        irq[i] = qdev_get_gpio_in(dev, i);
@@ -147,9 +146,9 @@ index 0000000000..d3cb558c19
 +		    115200, serial_hd(0), DEVICE_NATIVE_ENDIAN);
 +
 +    /* Register: Timer sys_clk_timer  */
-+    dev = qdev_create(NULL, "ALTR.timer");
++    dev = qdev_new("ALTR.timer");
 +    qdev_prop_set_uint32(dev, "clock-frequency", TIMER_0_FREQ);
-+    qdev_init_nofail(dev);
++    sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
 +    sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, TIMER_0_BASE);
 +    sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq[TIMER_0_IRQ_IDX]);
 +
@@ -197,5 +196,5 @@ index 0000000000..d3cb558c19
 +
 +DEFINE_MACHINE("altera_10m50_zephyr", altera_10m50_zephyr_machine_init)
 -- 
-2.17.1
+2.25.4
 

meta-zephyr-sdk/recipes-devtools/qemu/files/0001-hw-sparc-Add-leon-at697-machine.patch renamed to meta-zephyr-sdk/recipes-devtools/qemu/files/0002-hw-sparc-Add-leon-at697-machine.patch

@@ -1,7 +1,7 @@
-From 68db83222de1fcedc274c8e895f2ad5af3f7287e Mon Sep 17 00:00:00 2001
+From a879ceaaa4291d901701306ef9c3ffb25029a3bb Mon Sep 17 00:00:00 2001
 From: Yasushi SHOJI <[email protected]>
 Date: Wed, 9 Mar 2016 12:22:16 +0100
-Subject: [PATCH 1/4] hw/sparc: Add leon (at697) machine
+Subject: [PATCH 2/9] hw/sparc: Add leon (at697) machine
 
 This commit add LEON2 support.  It is taken from AdaCore Qemu
 repository at https://github.com/adacore/qemu.
@@ -961,7 +961,7 @@ index 355b07ae05..6c71aaf345 100644
 +leon_readl(uint64_t addr, uint32_t val) "addr:0x%"PRIx64" val:0x%x"
 +leon_writel(uint64_t addr, uint32_t val) "addr:0x%"PRIx64" val:0x%x"
 diff --git a/target/sparc/cpu.c b/target/sparc/cpu.c
-index 3f05aba9d6..21c8f80225 100644
+index cf21efd85f..f620e2dd5f 100644
 --- a/target/sparc/cpu.c
 +++ b/target/sparc/cpu.c
 @@ -514,7 +514,7 @@ static const sparc_def_t sparc_defs[] = {
@@ -974,5 +974,5 @@ index 3f05aba9d6..21c8f80225 100644
          .mmu_cxr_mask = 0x0000003f,
          .mmu_sfsr_mask = 0xffffffff,
 -- 
-2.17.1
+2.25.4
 

meta-zephyr-sdk/recipes-devtools/qemu/files/0002-hw-sparc-leon-Fix-compilation-errors.patch renamed to meta-zephyr-sdk/recipes-devtools/qemu/files/0003-hw-sparc-leon-Fix-compilation-errors.patch

@@ -1,7 +1,7 @@
-From e15e39df22e05e46fa6290b7159f58af2018cb4b Mon Sep 17 00:00:00 2001
+From 761c13e2bc6c6a065766227bf93a477a130dc59b Mon Sep 17 00:00:00 2001
 From: Yasushi SHOJI <[email protected]>
 Date: Thu, 5 Sep 2019 11:06:56 +0900
-Subject: [PATCH 2/4] hw/sparc/leon: Fix compilation errors
+Subject: [PATCH 3/9] hw/sparc/leon: Fix compilation errors
 
 The previous commit, taken from AdaCore repository as is for future
 reference, depends on other commit in the AdaCore repository and fails
@@ -87,5 +87,5 @@ index 316bd70288..cab394ba4b 100644
      if (kernel_filename != NULL) {
          long     kernel_size;
 -- 
-2.17.1
+2.25.4
 

meta-zephyr-sdk/recipes-devtools/qemu/files/0003-hw-sparc-leon-timer-Call-leon_timer_io_read-for-TIME.patch renamed to meta-zephyr-sdk/recipes-devtools/qemu/files/0004-hw-sparc-leon-timer-Call-leon_timer_io_read-for-TIME.patch

@@ -1,7 +1,7 @@
-From 7c55b9caf16c6d4b65a790546a6ad14002a9c571 Mon Sep 17 00:00:00 2001
+From b353246e6af1de0f26966838f6362e05772ce2c2 Mon Sep 17 00:00:00 2001
 From: Yasushi SHOJI <[email protected]>
 Date: Fri, 17 May 2019 21:42:30 +0900
-Subject: [PATCH 3/4] hw/sparc/leon: timer: Call leon_timer_io_read() for
+Subject: [PATCH 4/9] hw/sparc/leon: timer: Call leon_timer_io_read() for
  TIMER_1_COUNTER_REGISTER
 
 Accessing timer1 counter register (offset 0x40) always returned 0
@@ -43,5 +43,5 @@ index cab394ba4b..d2dc8e55c8 100644
          break;
 
 -- 
-2.17.1
+2.25.4
 

meta-zephyr-sdk/recipes-devtools/qemu/files/0004-hw-sparc-leon-Switch-to-transaction-based-ptimer-API.patch renamed to meta-zephyr-sdk/recipes-devtools/qemu/files/0005-hw-sparc-leon-Switch-to-transaction-based-ptimer-API.patch

@@ -1,7 +1,7 @@
-From 462345d42cb9bdb7b33bdf47bae42e0708ba79c4 Mon Sep 17 00:00:00 2001
+From 7ba9af98896dce92972257a4f2f98fa074bacd45 Mon Sep 17 00:00:00 2001
 From: Yasushi SHOJI <[email protected]>
 Date: Mon, 9 Dec 2019 11:56:20 +0900
-Subject: [PATCH 4/4] hw/sparc/leon: Switch to transaction-based ptimer API
+Subject: [PATCH 5/9] hw/sparc/leon: Switch to transaction-based ptimer API
 
 Switch the leon code away from old ptimers to the new
 transaction-based ptimer API.  This requires adding begin/commit calls
@@ -15,7 +15,7 @@ Signed-off-by: Yasushi SHOJI <[email protected]>
  1 file changed, 17 insertions(+), 5 deletions(-)
 
 diff --git a/hw/sparc/leon.c b/hw/sparc/leon.c
-index d2dc8e55c8..57ec9c1b1a 100644
+index d2dc8e55c8..384dde035b 100644
 --- a/hw/sparc/leon.c
 +++ b/hw/sparc/leon.c
 @@ -156,7 +156,6 @@ typedef struct LeonUartState {
@@ -99,5 +99,5 @@ index d2dc8e55c8..57ec9c1b1a 100644
 
  static uint64_t leon_io_read(void *opaque, hwaddr addr,
 -- 
-2.17.1
+2.25.4