[PATCH-for-11.0 09/13] hw/sh4/r2d: Use EXT_CS_BASE() macro for FPGA device

Philippe Mathieu-Daudé posted 13 patches 2 months, 2 weeks ago
Maintainers: Yoshinori Sato <yoshinori.sato@nifty.com>, Magnus Damm <magnus.damm@gmail.com>
[PATCH-for-11.0 09/13] hw/sh4/r2d: Use EXT_CS_BASE() macro for FPGA device
Posted by Philippe Mathieu-Daudé 2 months, 2 weeks ago
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/sh4/r2d.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 26edcabf2c0..2229cc6fe66 100644
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -253,6 +253,7 @@ static void r2d_init(MachineState *machine)
     USBBus *usb_bus;
     r2d_fpga_t *fpga;
     const hwaddr flash_base = EXT_CS_BASE(0);
+    const hwaddr fpga_base = EXT_CS_BASE(1);
     hwaddr sdram_base;
     uint64_t sdram_size = machine->ram_size;
 
@@ -278,7 +279,7 @@ static void r2d_init(MachineState *machine)
     memory_region_add_subregion(address_space_mem, sdram_base, sdram);
     /* Register peripherals */
     s = sh7750_init(cpu, address_space_mem);
-    fpga = r2d_fpga_init(address_space_mem, 0x04000000, sh7750_irl(s));
+    fpga = r2d_fpga_init(address_space_mem, fpga_base, sh7750_irl(s));
 
     dev = qdev_new("sh_pci");
     busdev = SYS_BUS_DEVICE(dev);
-- 
2.51.0