[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/38] ppc440_uc.c: Move some macros to ppc4xx.h
From: |
Daniel Henrique Barboza |
Subject: |
[PULL 18/38] ppc440_uc.c: Move some macros to ppc4xx.h |
Date: |
Mon, 17 Oct 2022 16:19:49 -0300 |
From: BALATON Zoltan <balaton@eik.bme.hu>
These are used by both the SDRAM controller model and system DCRs. In
preparation to move SDRAM controller in its own file move these macros
to the ppc4xx.h header.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Message-Id:
<74d9bf4891e2ccceb52bb6ca6b54fd3f37a9fb04.1664021647.git.balaton@eik.bme.hu>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
---
hw/ppc/ppc440_uc.c | 4 ----
include/hw/ppc/ppc4xx.h | 4 ++++
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c
index 55082f2b88..57274b56dd 100644
--- a/hw/ppc/ppc440_uc.c
+++ b/hw/ppc/ppc440_uc.c
@@ -380,10 +380,6 @@ enum {
PESDR1_RSTSTA = 0x365,
};
-#define SDR0_DDR0_DDRM_ENCODE(n) ((((unsigned long)(n)) & 0x03) << 29)
-#define SDR0_DDR0_DDRM_DDR1 0x20000000
-#define SDR0_DDR0_DDRM_DDR2 0x40000000
-
static uint32_t dcr_read_sdr(void *opaque, int dcrn)
{
ppc4xx_sdr_t *sdr = opaque;
diff --git a/include/hw/ppc/ppc4xx.h b/include/hw/ppc/ppc4xx.h
index ff88385ac0..10c6dd535f 100644
--- a/include/hw/ppc/ppc4xx.h
+++ b/include/hw/ppc/ppc4xx.h
@@ -111,6 +111,10 @@ struct Ppc4xxEbcState {
};
/* SDRAM DDR controller */
+#define SDR0_DDR0_DDRM_ENCODE(n) ((((unsigned long)(n)) & 0x03) << 29)
+#define SDR0_DDR0_DDRM_DDR1 0x20000000
+#define SDR0_DDR0_DDRM_DDR2 0x40000000
+
#define TYPE_PPC4xx_SDRAM_DDR "ppc4xx-sdram-ddr"
OBJECT_DECLARE_SIMPLE_TYPE(Ppc4xxSdramDdrState, PPC4xx_SDRAM_DDR);
struct Ppc4xxSdramDdrState {
--
2.37.3
- [PULL 03/38] ppc440_bamboo: Remove unnecessary memsets, (continued)
- [PULL 03/38] ppc440_bamboo: Remove unnecessary memsets, Daniel Henrique Barboza, 2022/10/17
- [PULL 08/38] ppc4xx_sdram: Move size check to ppc4xx_sdram_init(), Daniel Henrique Barboza, 2022/10/17
- [PULL 06/38] ppc4xx: Use Ppc4xxSdramBank in ppc4xx_sdram_banks(), Daniel Henrique Barboza, 2022/10/17
- [PULL 10/38] ppc4xx_sdram: Drop extra zeros for readability, Daniel Henrique Barboza, 2022/10/17
- [PULL 12/38] ppc440_sdram: Implement enable bit in the DDR2 SDRAM controller, Daniel Henrique Barboza, 2022/10/17
- [PULL 11/38] ppc440_sdram: Split off map/unmap of sdram banks for later reuse, Daniel Henrique Barboza, 2022/10/17
- [PULL 13/38] ppc440_sdram: Get rid of the init RAM hack, Daniel Henrique Barboza, 2022/10/17
- [PULL 15/38] ppc4xx_sdram: Rename functions to prevent name clashes, Daniel Henrique Barboza, 2022/10/17
- [PULL 09/38] ppc4xx_sdram: QOM'ify, Daniel Henrique Barboza, 2022/10/17
- [PULL 14/38] ppc440_sdram: Rename local variable for readability, Daniel Henrique Barboza, 2022/10/17
- [PULL 18/38] ppc440_uc.c: Move some macros to ppc4xx.h,
Daniel Henrique Barboza <=
- [PULL 16/38] ppc440_sdram: Move RAM size check to ppc440_sdram_init, Daniel Henrique Barboza, 2022/10/17
- [PULL 17/38] ppc440_sdram: QOM'ify, Daniel Henrique Barboza, 2022/10/17
- [PULL 26/38] hw/ppc/e500: Remove if statement which is now always true, Daniel Henrique Barboza, 2022/10/17
- [PULL 22/38] docs/system/ppc/ppce500: Add heading for networking chapter, Daniel Henrique Barboza, 2022/10/17
- [PULL 27/38] target/ppc: Fix xvcmp* clearing FI bit, Daniel Henrique Barboza, 2022/10/17
- [PULL 19/38] ppc440_uc.c: Remove unneeded parenthesis, Daniel Henrique Barboza, 2022/10/17
- [PULL 20/38] hw/ppc/meson: Allow e500 boards to be enabled separately, Daniel Henrique Barboza, 2022/10/17
- [PULL 21/38] hw/gpio/meson: Introduce dedicated config switch for hw/gpio/mpc8xxx, Daniel Henrique Barboza, 2022/10/17
- [PULL 29/38] qmp/hmp, device_tree.c: introduce dumpdtb, Daniel Henrique Barboza, 2022/10/17
- [PULL 31/38] hw/ppc: set machine->fdt in bamboo_load_device_tree(), Daniel Henrique Barboza, 2022/10/17