aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@linaro.org>2023-01-09 12:53:04 +0100
committerPeter Maydell <peter.maydell@linaro.org>2023-01-12 17:03:14 +0000
commitabf8361cf7bb235fc987509df8a08476ce5478b7 (patch)
tree64a34b0b6940bf18e61ec0f97a44d001cc56516a /hw
parentce848378b999214777fa984a8a0a3e3deb1cf687 (diff)
downloadqemu-abf8361cf7bb235fc987509df8a08476ce5478b7.zip
qemu-abf8361cf7bb235fc987509df8a08476ce5478b7.tar.gz
qemu-abf8361cf7bb235fc987509df8a08476ce5478b7.tar.bz2
hw/arm/pxa2xx: Simplify pxa255_init()
Since pxa255_init() must map the device in the system memory, there is no point in passing get_system_memory() by argument. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20230109115316.2235-2-philmd@linaro.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
-rw-r--r--hw/arm/gumstix.c3
-rw-r--r--hw/arm/pxa2xx.c4
-rw-r--r--hw/arm/tosa.c2
3 files changed, 5 insertions, 4 deletions
diff --git a/hw/arm/gumstix.c b/hw/arm/gumstix.c
index 3a4bc33..c167518 100644
--- a/hw/arm/gumstix.c
+++ b/hw/arm/gumstix.c
@@ -51,12 +51,11 @@ static void connex_init(MachineState *machine)
{
PXA2xxState *cpu;
DriveInfo *dinfo;
- MemoryRegion *address_space_mem = get_system_memory();
uint32_t connex_rom = 0x01000000;
uint32_t connex_ram = 0x04000000;
- cpu = pxa255_init(address_space_mem, connex_ram);
+ cpu = pxa255_init(connex_ram);
dinfo = drive_get(IF_PFLASH, 0, 0);
if (!dinfo && !qtest_enabled()) {
diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
index 93dda83..8b8845f 100644
--- a/hw/arm/pxa2xx.c
+++ b/hw/arm/pxa2xx.c
@@ -11,6 +11,7 @@
#include "qemu/error-report.h"
#include "qemu/module.h"
#include "qapi/error.h"
+#include "exec/address-spaces.h"
#include "cpu.h"
#include "hw/sysbus.h"
#include "migration/vmstate.h"
@@ -2230,8 +2231,9 @@ PXA2xxState *pxa270_init(MemoryRegion *address_space,
}
/* Initialise a PXA255 integrated chip (ARM based core). */
-PXA2xxState *pxa255_init(MemoryRegion *address_space, unsigned int sdram_size)
+PXA2xxState *pxa255_init(unsigned int sdram_size)
{
+ MemoryRegion *address_space = get_system_memory();
PXA2xxState *s;
int i;
DriveInfo *dinfo;
diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
index d5a6763..3ca2e44 100644
--- a/hw/arm/tosa.c
+++ b/hw/arm/tosa.c
@@ -242,7 +242,7 @@ static void tosa_init(MachineState *machine)
TC6393xbState *tmio;
DeviceState *scp0, *scp1;
- mpu = pxa255_init(address_space_mem, tosa_binfo.ram_size);
+ mpu = pxa255_init(tosa_binfo.ram_size);
memory_region_init_rom(rom, NULL, "tosa.rom", TOSA_ROM, &error_fatal);
memory_region_add_subregion(address_space_mem, 0, rom);