[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PATCH v4 30/43] hw/unicore32: restrict hw addr defines t
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-trivial] [PATCH v4 30/43] hw/unicore32: restrict hw addr defines to source file |
Date: |
Fri, 15 Dec 2017 00:30:02 -0300 |
and drop unused #includes
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
---
include/hw/unicore32/puv3.h | 10 ----------
hw/unicore32/puv3.c | 15 ++++++++++-----
2 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/include/hw/unicore32/puv3.h b/include/hw/unicore32/puv3.h
index 5a4839f8df..f587a1f622 100644
--- a/include/hw/unicore32/puv3.h
+++ b/include/hw/unicore32/puv3.h
@@ -14,16 +14,6 @@
#define PUV3_REGS_OFFSET (0x1000) /* 4K is reasonable */
-/* PKUnity System bus (AHB): 0xc0000000 - 0xedffffff (640MB) */
-#define PUV3_DMA_BASE (0xc0200000) /* AHB-4 */
-
-/* PKUnity Peripheral bus (APB): 0xee000000 - 0xefffffff (128MB) */
-#define PUV3_GPIO_BASE (0xee500000) /* APB-5 */
-#define PUV3_INTC_BASE (0xee600000) /* APB-6 */
-#define PUV3_OST_BASE (0xee800000) /* APB-8 */
-#define PUV3_PM_BASE (0xeea00000) /* APB-10 */
-#define PUV3_PS2_BASE (0xeeb00000) /* APB-11 */
-
/* Hardware interrupts */
#define PUV3_IRQS_NR (32)
diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c
index 1b39cc035b..db26959a1d 100644
--- a/hw/unicore32/puv3.c
+++ b/hw/unicore32/puv3.c
@@ -11,16 +11,11 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "qemu-common.h"
#include "cpu.h"
#include "ui/console.h"
-#include "elf.h"
-#include "exec/address-spaces.h"
-#include "hw/sysbus.h"
#include "hw/boards.h"
#include "hw/loader.h"
#include "hw/i386/pc.h"
-#include "qemu/error-report.h"
#include "sysemu/qtest.h"
#undef DEBUG_PUV3
@@ -29,6 +24,16 @@
#define KERNEL_LOAD_ADDR 0x03000000
#define KERNEL_MAX_SIZE 0x00800000 /* Just a guess */
+/* PKUnity System bus (AHB): 0xc0000000 - 0xedffffff (640MB) */
+#define PUV3_DMA_BASE (0xc0200000) /* AHB-4 */
+
+/* PKUnity Peripheral bus (APB): 0xee000000 - 0xefffffff (128MB) */
+#define PUV3_GPIO_BASE (0xee500000) /* APB-5 */
+#define PUV3_INTC_BASE (0xee600000) /* APB-6 */
+#define PUV3_OST_BASE (0xee800000) /* APB-8 */
+#define PUV3_PM_BASE (0xeea00000) /* APB-10 */
+#define PUV3_PS2_BASE (0xeeb00000) /* APB-11 */
+
static void puv3_intc_cpu_handler(void *opaque, int irq, int level)
{
UniCore32CPU *cpu = opaque;
--
2.15.1
- [Qemu-trivial] [PATCH v4 20/43] hw/input/vmmouse: remove unused #include, (continued)
- [Qemu-trivial] [PATCH v4 20/43] hw/input/vmmouse: remove unused #include, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-trivial] [PATCH v4 21/43] hw/misc/pvpanic: remove unused #include, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-trivial] [PATCH v4 22/43] hw/ssi/aspeed_smc: remove unused #include, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-trivial] [PATCH v4 23/43] amd_iommu: avoid needless includes in header file, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-trivial] [PATCH v4 24/43] misc: remove old i386 dependency, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-trivial] [PATCH v4 25/43] hw/ide: remove old i386 dependency, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-trivial] [PATCH v4 26/43] hw/ipmi: remove old i386 dependency, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-trivial] [PATCH v4 27/43] hw/i2c: remove old i386 dependency, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-trivial] [PATCH v4 28/43] hw/tpm: remove old i386 dependency, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-trivial] [PATCH v4 29/43] hw/virtio-balloon: remove old i386 dependency, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-trivial] [PATCH v4 30/43] hw/unicore32: restrict hw addr defines to source file,
Philippe Mathieu-Daudé <=
- [Qemu-trivial] [PATCH v4 31/43] hw/timer/i8254: rename pit_init() -> i8254_pit_init(), Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-trivial] [PATCH v4 32/43] hw/timer/mc146818: rename rtc_init() -> mc146818_rtc_init(), Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-trivial] [PATCH v4 33/43] hw/acpi: ACPI_PM_* defines are not restricted to i386 arch, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-trivial] [PATCH v4 34/43] hw/acpi/ich9: extract ACPI_PM_PROP_TCO_ENABLED from i386/pc, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-trivial] [PATCH v4 35/43] hw/display/vga: "vga.h" only contains registers defs, rename it "vga_regs.h", Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-trivial] [PATCH v4 36/43] hw/display/vga: "vga_int.h" requires "ui/console.h", Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-trivial] [PATCH v4 37/43] hw/display/vga: extract public API from i386/pc to "hw/display/vga.h", Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-trivial] [PATCH v4 38/43] hw/net/ne2000: extract ne2k-isa code from i386/pc to ne2000-isa.c, Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-trivial] [PATCH v4 39/43] hw/misc/pvpanic: extract public API from i386/pc to "hw/misc/pvpanic.h", Philippe Mathieu-Daudé, 2017/12/14
- [Qemu-trivial] [PATCH v4 40/43] i386/pc: move vmport.c to hw/i386/, Philippe Mathieu-Daudé, 2017/12/14