qemu: Bump to v5.0.0

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

@@ -1,4 +1,4 @@
-From dc2b51e48106bd1fb178673e65b844281caa4141 Mon Sep 17 00:00:00 2001
+From 68db83222de1fcedc274c8e895f2ad5af3f7287e Mon Sep 17 00:00:00 2001
 From: Yasushi SHOJI <y-shoji@ispace-inc.com>
 Date: Wed, 9 Mar 2016 12:22:16 +0100
 Subject: [PATCH 1/4] hw/sparc: Add leon (at697) machine
@@ -57,7 +57,7 @@ index d57e33f83e..c585fdd9d4 100644
 +obj-y += leon.o
 diff --git a/hw/sparc/leon.c b/hw/sparc/leon.c
 new file mode 100644
-index 0000000000..1505bf0e0b
+index 0000000000..316bd70288
 --- /dev/null
 +++ b/hw/sparc/leon.c
 @@ -0,0 +1,878 @@
@@ -432,7 +432,7 @@ index 0000000000..1505bf0e0b
 +    leon_uart_check_irq(s);
 +}
 +
-+static void leon_uart_event(void *opaque, int event)
++static void leon_uart_event(void *opaque, QEMUChrEvent event)
 +{
 +    trace_leon_uart_event(event);
 +}
@@ -914,9 +914,9 @@ index 0000000000..1505bf0e0b
 +        long     kernel_size;
 +        uint64_t entry;
 +
-+        kernel_size = load_elf(kernel_filename, NULL, NULL, NULL, &entry,
-+                               NULL, NULL, 1 /* big endian */, EM_SPARC, 0,
-+                               0);
++        kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
++                               &entry, NULL, NULL, NULL,
++                               1 /* big endian */, EM_SPARC, 0, 0);
 +        if (kernel_size < 0) {
 +            fprintf(stderr, "qemu: could not load kernel '%s'\n",
 +                    kernel_filename);
@@ -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 bc65929552..483b7377a6 100644
+index 3f05aba9d6..21c8f80225 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 bc65929552..483b7377a6 100644
          .mmu_cxr_mask = 0x0000003f,
          .mmu_sfsr_mask = 0xffffffff,
 -- 
-2.24.0
+2.17.1
 

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

@@ -1,4 +1,4 @@
-From 4809f7db06e9394f372605d0d1207e42fbdf2a0a Mon Sep 17 00:00:00 2001
+From e896d97b008901e79003fc9fb5acc20ba0a062f9 Mon Sep 17 00:00:00 2001
 From: Ramakrishna Pallala <ramakrishna.pallala@intel.com>
 Date: Fri, 17 May 2019 10:15:15 -0500
 Subject: [PATCH] qemu/nios2: Add Altera MAX 10 board support for Zephyr OS
@@ -27,7 +27,7 @@ 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..a0a201d78f
+index 0000000000..d3cb558c19
 --- /dev/null
 +++ b/hw/nios2/altera_10m50_zephyr.c
 @@ -0,0 +1,165 @@
@@ -164,7 +164,7 @@ index 0000000000..a0a201d78f
 +
 +        /* Boots a kernel elf binary.  */
 +        kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
-+                               &entry, NULL, NULL,
++                               &entry, NULL, NULL, NULL,
 +                               0, EM_ALTERA_NIOS2, 0, 0);
 +
 +        boot_info_zephyr.bootstrap_pc = entry;
@@ -197,5 +197,5 @@ index 0000000000..a0a201d78f
 +
 +DEFINE_MACHINE("altera_10m50_zephyr", altera_10m50_zephyr_machine_init)
 -- 
-2.20.1
+2.17.1
 

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

@@ -1,4 +1,4 @@
-From 21a648b2aa12c05c1482987c85a321904b354a24 Mon Sep 17 00:00:00 2001
+From e15e39df22e05e46fa6290b7159f58af2018cb4b Mon Sep 17 00:00:00 2001
 From: Yasushi SHOJI <y-shoji@ispace-inc.com>
 Date: Thu, 5 Sep 2019 11:06:56 +0900
 Subject: [PATCH 2/4] hw/sparc/leon: Fix compilation errors
@@ -22,7 +22,7 @@ Signed-off-by: Yasushi SHOJI <y-shoji@ispace-inc.com>
  1 file changed, 7 insertions(+), 12 deletions(-)
 
 diff --git a/hw/sparc/leon.c b/hw/sparc/leon.c
-index 1505bf0e0b..c4ddef0718 100644
+index 316bd70288..cab394ba4b 100644
 --- a/hw/sparc/leon.c
 +++ b/hw/sparc/leon.c
 @@ -22,12 +22,16 @@
@@ -87,5 +87,5 @@ index 1505bf0e0b..c4ddef0718 100644
      if (kernel_filename != NULL) {
          long     kernel_size;
 -- 
-2.24.0
+2.17.1
 

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

@@ -1,4 +1,4 @@
-From a04f2e8db3f112596cec1ea37d44864eb6f49d23 Mon Sep 17 00:00:00 2001
+From 7c55b9caf16c6d4b65a790546a6ad14002a9c571 Mon Sep 17 00:00:00 2001
 From: Yasushi SHOJI <y-shoji@ispace-inc.com>
 Date: Fri, 17 May 2019 21:42:30 +0900
 Subject: [PATCH 3/4] hw/sparc/leon: timer: Call leon_timer_io_read() for
@@ -21,7 +21,7 @@ Signed-off-by: Yasushi SHOJI <y-shoji@ispace-inc.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/hw/sparc/leon.c b/hw/sparc/leon.c
-index c4ddef0718..8e38a33c62 100644
+index cab394ba4b..d2dc8e55c8 100644
 --- a/hw/sparc/leon.c
 +++ b/hw/sparc/leon.c
 @@ -616,7 +616,7 @@ static uint64_t leon_io_read(void *opaque, hwaddr addr,
@@ -43,5 +43,5 @@ index c4ddef0718..8e38a33c62 100644
          break;
 
 -- 
-2.24.0
+2.17.1
 

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

@@ -1,4 +1,4 @@
-From 9ccfc36d78f50a9506379bcabf795e0da0f98bee Mon Sep 17 00:00:00 2001
+From 462345d42cb9bdb7b33bdf47bae42e0708ba79c4 Mon Sep 17 00:00:00 2001
 From: Yasushi SHOJI <y-shoji@ispace-inc.com>
 Date: Mon, 9 Dec 2019 11:56:20 +0900
 Subject: [PATCH 4/4] hw/sparc/leon: Switch to transaction-based ptimer API
@@ -15,7 +15,7 @@ Signed-off-by: Yasushi SHOJI <y-shoji@ispace-inc.com>
  1 file changed, 17 insertions(+), 5 deletions(-)
 
 diff --git a/hw/sparc/leon.c b/hw/sparc/leon.c
-index 8e38a33c62..f2e12d714f 100644
+index d2dc8e55c8..57ec9c1b1a 100644
 --- a/hw/sparc/leon.c
 +++ b/hw/sparc/leon.c
 @@ -156,7 +156,6 @@ typedef struct LeonUartState {
@@ -99,5 +99,5 @@ index 8e38a33c62..f2e12d714f 100644
 
  static uint64_t leon_io_read(void *opaque, hwaddr addr,
 -- 
-2.24.0
+2.17.1