[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/15] hw/arm/allwinner-a10: Move SoC definitions out of header
From: |
Peter Maydell |
Subject: |
[PULL 07/15] hw/arm/allwinner-a10: Move SoC definitions out of header |
Date: |
Fri, 17 Jan 2020 14:28:08 +0000 |
From: Philippe Mathieu-Daudé <address@hidden>
These definitions are specific to the A10 SoC and don't need
to be exported to the different Allwinner peripherals.
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
---
include/hw/arm/allwinner-a10.h | 6 ------
hw/arm/allwinner-a10.c | 6 ++++++
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/hw/arm/allwinner-a10.h b/include/hw/arm/allwinner-a10.h
index 7d2d2156308..941c61e5336 100644
--- a/include/hw/arm/allwinner-a10.h
+++ b/include/hw/arm/allwinner-a10.h
@@ -12,12 +12,6 @@
#include "target/arm/cpu.h"
-#define AW_A10_PIC_REG_BASE 0x01c20400
-#define AW_A10_PIT_REG_BASE 0x01c20c00
-#define AW_A10_UART0_REG_BASE 0x01c28000
-#define AW_A10_EMAC_BASE 0x01c0b000
-#define AW_A10_SATA_BASE 0x01c18000
-
#define AW_A10_SDRAM_BASE 0x40000000
#define TYPE_AW_A10 "allwinner-a10"
diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c
index 118032c8c72..0f1af5a880f 100644
--- a/hw/arm/allwinner-a10.c
+++ b/hw/arm/allwinner-a10.c
@@ -25,6 +25,12 @@
#include "hw/misc/unimp.h"
#include "sysemu/sysemu.h"
+#define AW_A10_PIC_REG_BASE 0x01c20400
+#define AW_A10_PIT_REG_BASE 0x01c20c00
+#define AW_A10_UART0_REG_BASE 0x01c28000
+#define AW_A10_EMAC_BASE 0x01c0b000
+#define AW_A10_SATA_BASE 0x01c18000
+
static void aw_a10_init(Object *obj)
{
AwA10State *s = AW_A10(obj);
--
2.20.1
- [PULL 00/15] target-arm queue, Peter Maydell, 2020/01/17
- [PULL 01/15] hw/misc: Add the STM32F4xx Sysconfig device, Peter Maydell, 2020/01/17
- [PULL 02/15] hw/misc: Add the STM32F4xx EXTI device, Peter Maydell, 2020/01/17
- [PULL 03/15] hw/arm: Add the STM32F4xx SoC, Peter Maydell, 2020/01/17
- [PULL 04/15] hw/arm: Add the Netduino Plus 2, Peter Maydell, 2020/01/17
- [PULL 05/15] tests/boot_linux_console: Add initrd test for the CubieBoard, Peter Maydell, 2020/01/17
- [PULL 08/15] hw/arm/allwinner-a10: Simplify by passing IRQs with qdev_pass_gpios(), Peter Maydell, 2020/01/17
- [PULL 07/15] hw/arm/allwinner-a10: Move SoC definitions out of header,
Peter Maydell <=
- [PULL 06/15] tests/boot_linux_console: Add a SD card test for the CubieBoard, Peter Maydell, 2020/01/17
- [PULL 09/15] hw/arm/allwinner-a10: Remove local qemu_irq variables, Peter Maydell, 2020/01/17
- [PULL 10/15] target/arm/arm-semi: fix SYS_OPEN to return nonzero filehandle, Peter Maydell, 2020/01/17
- [PULL 12/15] target/arm: adjust program counter for wfi exception in AArch32, Peter Maydell, 2020/01/17
- [PULL 11/15] i.MX: add an emulation for RNGC, Peter Maydell, 2020/01/17
- [PULL 14/15] target/arm: Return correct IL bit in merge_syn_data_abort, Peter Maydell, 2020/01/17
- [PULL 15/15] target/arm: Set ISSIs16Bit in make_issinfo, Peter Maydell, 2020/01/17
- [PULL 13/15] arm/gicv3: update virtual irq state after IAR register read, Peter Maydell, 2020/01/17
- Re: [PULL 00/15] target-arm queue, Peter Maydell, 2020/01/17