[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 49/61] hw/unicore32: restrict hw addr defines to so
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 49/61] hw/unicore32: restrict hw addr defines to source file |
Date: |
Mon, 18 Dec 2017 00:27:54 +0300 |
From: Philippe Mathieu-Daudé <address@hidden>
and drop unused #includes
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
---
hw/unicore32/puv3.c | 15 ++++++++++-----
include/hw/unicore32/puv3.h | 10 ----------
2 files changed, 10 insertions(+), 15 deletions(-)
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;
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)
--
2.11.0
- [Qemu-trivial] [PULL 35/61] i386/hax: remove duplicated include, (continued)
- [Qemu-trivial] [PULL 14/61] Makefile: add more targets to the UNCHECKED_GOALS rule, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 17/61] hw/registerfields: add 64-bit extract/deposit macros, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 48/61] hw/virtio-balloon: remove old i386 dependency, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 49/61] hw/unicore32: restrict hw addr defines to source file,
Michael Tokarev <=
- [Qemu-trivial] [PULL 51/61] hw/timer/mc146818: rename rtc_init() -> mc146818_rtc_init(), Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 38/61] numa: remove unused #include, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 12/61] build: fix typo in error message, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 18/61] hw/registerfields: add missing include, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 46/61] hw/i2c: remove old i386 dependency, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 31/61] misc: remove headers implicitly included, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 37/61] misc: avoid "include/" in include path, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 19/61] hw/input/hid: Add support for several keys., Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 16/61] hw/registerfields: fix a typo in the FIELD() documentation, Michael Tokarev, 2017/12/17
- [Qemu-trivial] [PULL 20/61] MAINTAINERS: add entries for i2c/ppc4xx, Michael Tokarev, 2017/12/17