From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-devel@nongnu.org
Subject: [PULL 07/15] hw/arm/allwinner-a10: Move SoC definitions out of header
Date: Fri, 17 Jan 2020 14:28:08 +0000 [thread overview]
Message-ID: <20200117142816.15110-8-peter.maydell@linaro.org> (raw)
In-Reply-To: <20200117142816.15110-1-peter.maydell@linaro.org>
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
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é <f4bug@amsat.org>
Message-id: 20191230110953.25496-4-f4bug@amsat.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
---
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
next prev parent reply other threads:[~2020-01-17 14:38 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-17 14:28 [PULL 00/15] target-arm queue Peter Maydell
2020-01-17 14:28 ` [PULL 01/15] hw/misc: Add the STM32F4xx Sysconfig device Peter Maydell
2020-01-17 14:28 ` [PULL 02/15] hw/misc: Add the STM32F4xx EXTI device Peter Maydell
2020-01-17 14:28 ` [PULL 03/15] hw/arm: Add the STM32F4xx SoC Peter Maydell
2020-01-17 14:28 ` [PULL 04/15] hw/arm: Add the Netduino Plus 2 Peter Maydell
2020-01-17 14:28 ` [PULL 05/15] tests/boot_linux_console: Add initrd test for the CubieBoard Peter Maydell
2020-01-17 14:28 ` [PULL 06/15] tests/boot_linux_console: Add a SD card " Peter Maydell
2020-01-17 14:28 ` Peter Maydell [this message]
2020-01-17 14:28 ` [PULL 08/15] hw/arm/allwinner-a10: Simplify by passing IRQs with qdev_pass_gpios() Peter Maydell
2020-01-17 14:28 ` [PULL 09/15] hw/arm/allwinner-a10: Remove local qemu_irq variables Peter Maydell
2020-01-17 14:28 ` [PULL 10/15] target/arm/arm-semi: fix SYS_OPEN to return nonzero filehandle Peter Maydell
2020-01-17 14:28 ` [PULL 11/15] i.MX: add an emulation for RNGC Peter Maydell
2020-01-17 14:28 ` [PULL 12/15] target/arm: adjust program counter for wfi exception in AArch32 Peter Maydell
2020-01-17 14:28 ` [PULL 13/15] arm/gicv3: update virtual irq state after IAR register read Peter Maydell
2020-01-17 14:28 ` [PULL 14/15] target/arm: Return correct IL bit in merge_syn_data_abort Peter Maydell
2020-01-17 14:28 ` [PULL 15/15] target/arm: Set ISSIs16Bit in make_issinfo Peter Maydell
2020-01-17 18:03 ` [PULL 00/15] target-arm queue Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200117142816.15110-8-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.