From 190cd0215b1667d41db4ca2f04f0e1fa8c75027c Mon Sep 17 00:00:00 2001
From: pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sat, 11 Apr 2009 17:33:00 +0000
Subject: [PATCH] Remove redundant ram_require machine properly.
Signed-off-by: Paul Brook <paul@codesourcery.com>
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@7090 c046a42c-6fe2-441c-8c8c-71466251a162
---
hw/an5206.c | 1 -
hw/axis_dev88.c | 1 -
hw/boards.h | 2 --
hw/etraxfs.c | 1 -
hw/gumstix.c | 2 --
hw/integratorcp.c | 1 -
hw/mainstone.c | 2 --
hw/mcf5208.c | 1 -
hw/mips_jazz.c | 2 --
hw/mips_malta.c | 1 -
hw/mips_mipssim.c | 1 -
hw/mips_r4k.c | 1 -
hw/musicpal.c | 2 --
hw/nseries.c | 4 ----
hw/omap_sx1.c | 2 --
hw/palm.c | 2 --
hw/pc.c | 2 --
hw/ppc405_boards.c | 2 --
hw/ppc440_bamboo.c | 1 -
hw/ppc_newworld.c | 1 -
hw/ppc_oldworld.c | 1 -
hw/ppc_prep.c | 1 -
hw/ppce500_mpc8544ds.c | 1 -
hw/r2d.c | 1 -
hw/realview.c | 1 -
hw/shix.c | 1 -
hw/spitz.c | 4 ----
hw/stellaris.c | 2 --
hw/sun4m.c | 15 ---------------
hw/sun4u.c | 3 ---
hw/tosa.c | 1 -
31 files changed, 63 deletions(-)
diff --git a/hw/an5206.c b/hw/an5206.c
index cd40d2a504a..a5e352eb295 100644
--- a/hw/an5206.c
+++ b/hw/an5206.c
@@ -88,5 +88,4 @@ QEMUMachine an5206_machine = {
.name = "an5206",
.desc = "Arnewsh 5206",
.init = an5206_init,
- .ram_require = 512,
};
diff --git a/hw/axis_dev88.c b/hw/axis_dev88.c
index aa6125aceba..85ca81e7727 100644
--- a/hw/axis_dev88.c
+++ b/hw/axis_dev88.c
@@ -366,5 +366,4 @@ QEMUMachine axisdev88_machine = {
.name = "axis-dev88",
.desc = "AXIS devboard 88",
.init = axisdev88_init,
- .ram_require = 0x8000000,
};
diff --git a/hw/boards.h b/hw/boards.h
index 1e18ba6009e..7fada948e45 100644
--- a/hw/boards.h
+++ b/hw/boards.h
@@ -14,8 +14,6 @@ typedef struct QEMUMachine {
const char *name;
const char *desc;
QEMUMachineInitFunc *init;
-#define RAMSIZE_FIXED (1 << 0)
- ram_addr_t ram_require;
int use_scsi;
int max_cpus;
struct QEMUMachine *next;
diff --git a/hw/etraxfs.c b/hw/etraxfs.c
index 445f5f9012e..03bff484436 100644
--- a/hw/etraxfs.c
+++ b/hw/etraxfs.c
@@ -157,5 +157,4 @@ QEMUMachine bareetraxfs_machine = {
.name = "bareetraxfs",
.desc = "Bare ETRAX FS board",
.init = bareetraxfs_init,
- .ram_require = 0x8000000,
};
diff --git a/hw/gumstix.c b/hw/gumstix.c
index 87d84b6b92e..cce86fba692 100644
--- a/hw/gumstix.c
+++ b/hw/gumstix.c
@@ -113,12 +113,10 @@ QEMUMachine connex_machine = {
.name = "connex",
.desc = "Gumstix Connex (PXA255)",
.init = connex_init,
- .ram_require = (0x05000000 + PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED,
};
QEMUMachine verdex_machine = {
.name = "verdex",
.desc = "Gumstix Verdex (PXA270)",
.init = verdex_init,
- .ram_require = (0x12000000 + PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED,
};
diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index 8f2ff2da60a..68f34f6368f 100644
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -510,5 +510,4 @@ QEMUMachine integratorcp_machine = {
.name = "integratorcp",
.desc = "ARM Integrator/CP (ARM926EJ-S)",
.init = integratorcp_init,
- .ram_require = 0x100000,
};
diff --git a/hw/mainstone.c b/hw/mainstone.c
index e5bca4af9ba..522254a68e0 100644
--- a/hw/mainstone.c
+++ b/hw/mainstone.c
@@ -139,6 +139,4 @@ QEMUMachine mainstone2_machine = {
.name = "mainstone",
.desc = "Mainstone II (PXA27x)",
.init = mainstone_init,
- .ram_require = (MAINSTONE_RAM + MAINSTONE_ROM + 2 * MAINSTONE_FLASH +
- PXA2XX_INTERNAL_SIZE) | RAMSIZE_FIXED,
};
diff --git a/hw/mcf5208.c b/hw/mcf5208.c
index 02aabdf84c5..5404dba79c1 100644
--- a/hw/mcf5208.c
+++ b/hw/mcf5208.c
@@ -294,5 +294,4 @@ QEMUMachine mcf5208evb_machine = {
.name = "mcf5208evb",
.desc = "MCF5206EVB",
.init = mcf5208evb_init,
- .ram_require = 16384,
};
diff --git a/hw/mips_jazz.c b/hw/mips_jazz.c
index 2931b4753c9..510812ebef1 100644
--- a/hw/mips_jazz.c
+++ b/hw/mips_jazz.c
@@ -292,7 +292,6 @@ QEMUMachine mips_magnum_machine = {
.name = "magnum",
.desc = "MIPS Magnum",
.init = mips_magnum_init,
- .ram_require = MAGNUM_BIOS_SIZE + VGA_RAM_SIZE,
.use_scsi = 1,
};
@@ -300,6 +299,5 @@ QEMUMachine mips_pica61_machine = {
.name = "pica61",
.desc = "Acer Pica 61",
.init = mips_pica61_init,
- .ram_require = MAGNUM_BIOS_SIZE + VGA_RAM_SIZE,
.use_scsi = 1,
};
diff --git a/hw/mips_malta.c b/hw/mips_malta.c
index bbc73228e66..e7504c1bf58 100644
--- a/hw/mips_malta.c
+++ b/hw/mips_malta.c
@@ -958,5 +958,4 @@ QEMUMachine mips_malta_machine = {
.name = "malta",
.desc = "MIPS Malta Core LV",
.init = mips_malta_init,
- .ram_require = VGA_RAM_SIZE + BIOS_SIZE,
};
diff --git a/hw/mips_mipssim.c b/hw/mips_mipssim.c
index f20f7968403..676cd265c5c 100644
--- a/hw/mips_mipssim.c
+++ b/hw/mips_mipssim.c
@@ -187,5 +187,4 @@ QEMUMachine mips_mipssim_machine = {
.name = "mipssim",
.desc = "MIPS MIPSsim platform",
.init = mips_mipssim_init,
- .ram_require = BIOS_SIZE + VGA_RAM_SIZE /* unused */,
};
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index ba44037f152..51232cf36e0 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -284,5 +284,4 @@ QEMUMachine mips_machine = {
.name = "mips",
.desc = "mips r4k platform",
.init = mips_r4k_init,
- .ram_require = VGA_RAM_SIZE + BIOS_SIZE,
};
diff --git a/hw/musicpal.c b/hw/musicpal.c
index 9fb6c61090f..5de16911ae9 100644
--- a/hw/musicpal.c
+++ b/hw/musicpal.c
@@ -1594,6 +1594,4 @@ QEMUMachine musicpal_machine = {
.name = "musicpal",
.desc = "Marvell 88w8618 / MusicPal (ARM926EJ-S)",
.init = musicpal_init,
- .ram_require = MP_RAM_DEFAULT_SIZE + MP_SRAM_SIZE +
- MP_FLASH_SIZE_MAX + RAMSIZE_FIXED,
};
diff --git a/hw/nseries.c b/hw/nseries.c
index 17bcac6d736..dafc0ba81d8 100644
--- a/hw/nseries.c
+++ b/hw/nseries.c
@@ -1407,14 +1407,10 @@ QEMUMachine n800_machine = {
.name = "n800",
.desc = "Nokia N800 tablet aka. RX-34 (OMAP2420)",
.init = n800_init,
- .ram_require = (0x08000000 + 0x00018000 + OMAP242X_SRAM_SIZE) |
- RAMSIZE_FIXED,
};
QEMUMachine n810_machine = {
.name = "n810",
.desc = "Nokia N810 tablet aka. RX-44 (OMAP2420)",
.init = n810_init,
- .ram_require = (0x08000000 + 0x00018000 + OMAP242X_SRAM_SIZE) |
- RAMSIZE_FIXED,
};
diff --git a/hw/omap_sx1.c b/hw/omap_sx1.c
index afd2581fa6b..5145a63e9c7 100644
--- a/hw/omap_sx1.c
+++ b/hw/omap_sx1.c
@@ -227,12 +227,10 @@ QEMUMachine sx1_machine_v2 = {
.name = "sx1",
.desc = "Siemens SX1 (OMAP310) V2",
.init = sx1_init_v2,
- .ram_require = total_ram_v2 | RAMSIZE_FIXED,
};
QEMUMachine sx1_machine_v1 = {
.name = "sx1-v1",
.desc = "Siemens SX1 (OMAP310) V1",
.init = sx1_init_v1,
- .ram_require = total_ram_v1 | RAMSIZE_FIXED,
};
diff --git a/hw/palm.c b/hw/palm.c
index 0b504a9b0a6..865dabb91b0 100644
--- a/hw/palm.c
+++ b/hw/palm.c
@@ -285,6 +285,4 @@ QEMUMachine palmte_machine = {
.name = "cheetah",
.desc = "Palm Tungsten|E aka. Cheetah PDA (OMAP310)",
.init = palmte_init,
- .ram_require = (0x02000000 + 0x00800000 + OMAP15XX_SRAM_SIZE) |
- RAMSIZE_FIXED,
};
diff --git a/hw/pc.c b/hw/pc.c
index 5f7b7d5f740..6a1750e10bb 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -1137,7 +1137,6 @@ QEMUMachine pc_machine = {
.name = "pc",
.desc = "Standard PC",
.init = pc_init_pci,
- .ram_require = VGA_RAM_SIZE + PC_MAX_BIOS_SIZE,
.max_cpus = 255,
};
@@ -1145,6 +1144,5 @@ QEMUMachine isapc_machine = {
.name = "isapc",
.desc = "ISA-only PC",
.init = pc_init_isa,
- .ram_require = VGA_RAM_SIZE + PC_MAX_BIOS_SIZE,
.max_cpus = 1,
};
diff --git a/hw/ppc405_boards.c b/hw/ppc405_boards.c
index df834cd8530..6e9bfca3740 100644
--- a/hw/ppc405_boards.c
+++ b/hw/ppc405_boards.c
@@ -349,7 +349,6 @@ QEMUMachine ref405ep_machine = {
.name = "ref405ep",
.desc = "ref405ep",
.init = ref405ep_init,
- .ram_require = (128 * 1024 * 1024 + 4096 + 512 * 1024 + BIOS_SIZE) | RAMSIZE_FIXED,
};
/*****************************************************************************/
@@ -630,5 +629,4 @@ QEMUMachine taihu_machine = {
"taihu",
"taihu",
taihu_405ep_init,
- (128 * 1024 * 1024 + 4096 + BIOS_SIZE + 32 * 1024 * 1024) | RAMSIZE_FIXED,
};
diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
index b249e00c696..6963309306c 100644
--- a/hw/ppc440_bamboo.c
+++ b/hw/ppc440_bamboo.c
@@ -190,5 +190,4 @@ QEMUMachine bamboo_machine = {
.name = "bamboo",
.desc = "bamboo",
.init = bamboo_init,
- .ram_require = 8<<20 | RAMSIZE_FIXED,
};
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index feae74a22ab..f67b727e6c6 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -357,6 +357,5 @@ QEMUMachine core99_machine = {
.name = "mac99",
.desc = "Mac99 based PowerMAC",
.init = ppc_core99_init,
- .ram_require = BIOS_SIZE + VGA_BIOS_SIZE + VGA_RAM_SIZE,
.max_cpus = MAX_CPUS,
};
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index a29999293fc..06c77b47898 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -388,6 +388,5 @@ QEMUMachine heathrow_machine = {
.name = "g3beige",
.desc = "Heathrow based PowerMAC",
.init = ppc_heathrow_init,
- .ram_require = BIOS_SIZE + VGA_BIOS_SIZE + VGA_RAM_SIZE,
.max_cpus = MAX_CPUS,
};
diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 07b572639e9..0e2d58131d7 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -764,6 +764,5 @@ QEMUMachine prep_machine = {
.name = "prep",
.desc = "PowerPC PREP platform",
.init = ppc_prep_init,
- .ram_require = BIOS_SIZE + VGA_RAM_SIZE,
.max_cpus = MAX_CPUS,
};
diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c
index 50ad8149e5d..d946f038e4f 100644
--- a/hw/ppce500_mpc8544ds.c
+++ b/hw/ppce500_mpc8544ds.c
@@ -286,5 +286,4 @@ QEMUMachine mpc8544ds_machine = {
.name = "mpc8544ds",
.desc = "mpc8544ds",
.init = mpc8544ds_init,
- .ram_require = RAM_SIZES_ALIGN | RAMSIZE_FIXED,
};
diff --git a/hw/r2d.c b/hw/r2d.c
index 4ee02c11d88..4684296b7a0 100644
--- a/hw/r2d.c
+++ b/hw/r2d.c
@@ -262,5 +262,4 @@ QEMUMachine r2d_machine = {
.name = "r2d",
.desc = "r2d-plus board",
.init = r2d_init,
- .ram_require = (SDRAM_SIZE + SM501_VRAM_SIZE) | RAMSIZE_FIXED,
};
diff --git a/hw/realview.c b/hw/realview.c
index 959b99e688f..e41be498064 100644
--- a/hw/realview.c
+++ b/hw/realview.c
@@ -204,6 +204,5 @@ QEMUMachine realview_machine = {
.name = "realview",
.desc = "ARM RealView Emulation Baseboard (ARM926EJ-S)",
.init = realview_init,
- .ram_require = 0x1000,
.use_scsi = 1,
};
diff --git a/hw/shix.c b/hw/shix.c
index 61bc735dea2..cba62e754d1 100644
--- a/hw/shix.c
+++ b/hw/shix.c
@@ -92,5 +92,4 @@ QEMUMachine shix_machine = {
.name = "shix",
.desc = "shix card",
.init = shix_init,
- .ram_require = (0x00004000 + 0x01000000 + 0x01000000) | RAMSIZE_FIXED,
};
diff --git a/hw/spitz.c b/hw/spitz.c
index 852d9b9675c..c4133fdd3a1 100644
--- a/hw/spitz.c
+++ b/hw/spitz.c
@@ -1003,26 +1003,22 @@ QEMUMachine akitapda_machine = {
.name = "akita",
.desc = "Akita PDA (PXA270)",
.init = akita_init,
- .ram_require = SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
};
QEMUMachine spitzpda_machine = {
.name = "spitz",
.desc = "Spitz PDA (PXA270)",
.init = spitz_init,
- .ram_require = SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
};
QEMUMachine borzoipda_machine = {
.name = "borzoi",
.desc = "Borzoi PDA (PXA270)",
.init = borzoi_init,
- .ram_require = SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
};
QEMUMachine terrierpda_machine = {
.name = "terrier",
.desc = "Terrier PDA (PXA270)",
.init = terrier_init,
- .ram_require = SPITZ_RAM + SPITZ_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED,
};
diff --git a/hw/stellaris.c b/hw/stellaris.c
index aeeab960b7a..cefad852697 100644
--- a/hw/stellaris.c
+++ b/hw/stellaris.c
@@ -1398,12 +1398,10 @@ QEMUMachine lm3s811evb_machine = {
.name = "lm3s811evb",
.desc = "Stellaris LM3S811EVB",
.init = lm3s811evb_init,
- .ram_require = (64 * 1024 + 8 * 1024) | RAMSIZE_FIXED,
};
QEMUMachine lm3s6965evb_machine = {
.name = "lm3s6965evb",
.desc = "Stellaris LM3S6965EVB",
.init = lm3s6965evb_init,
- .ram_require = (256 * 1024 + 64 * 1024) | RAMSIZE_FIXED,
};
diff --git a/hw/sun4m.c b/hw/sun4m.c
index a4590557040..1f1efd07330 100644
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -83,9 +83,6 @@
#define CFG_ADDR 0xd00000510ULL
#define FW_CFG_SUN4M_DEPTH (FW_CFG_ARCH_LOCAL + 0x00)
-// Control plane, 8-bit and 24-bit planes
-#define TCX_SIZE (9 * 1024 * 1024)
-
#define MAX_CPUS 16
#define MAX_PILS 16
@@ -1028,7 +1025,6 @@ QEMUMachine ss5_machine = {
.name = "SS-5",
.desc = "Sun4m platform, SPARCstation 5",
.init = ss5_init,
- .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.use_scsi = 1,
};
@@ -1036,7 +1032,6 @@ QEMUMachine ss10_machine = {
.name = "SS-10",
.desc = "Sun4m platform, SPARCstation 10",
.init = ss10_init,
- .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.use_scsi = 1,
.max_cpus = 4,
};
@@ -1045,7 +1040,6 @@ QEMUMachine ss600mp_machine = {
.name = "SS-600MP",
.desc = "Sun4m platform, SPARCserver 600MP",
.init = ss600mp_init,
- .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.use_scsi = 1,
.max_cpus = 4,
};
@@ -1054,7 +1048,6 @@ QEMUMachine ss20_machine = {
.name = "SS-20",
.desc = "Sun4m platform, SPARCstation 20",
.init = ss20_init,
- .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.use_scsi = 1,
.max_cpus = 4,
};
@@ -1063,7 +1056,6 @@ QEMUMachine voyager_machine = {
.name = "Voyager",
.desc = "Sun4m platform, SPARCstation Voyager",
.init = vger_init,
- .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.use_scsi = 1,
};
@@ -1071,7 +1063,6 @@ QEMUMachine ss_lx_machine = {
.name = "LX",
.desc = "Sun4m platform, SPARCstation LX",
.init = ss_lx_init,
- .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.use_scsi = 1,
};
@@ -1079,7 +1070,6 @@ QEMUMachine ss4_machine = {
.name = "SS-4",
.desc = "Sun4m platform, SPARCstation 4",
.init = ss4_init,
- .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.use_scsi = 1,
};
@@ -1087,7 +1077,6 @@ QEMUMachine scls_machine = {
.name = "SPARCClassic",
.desc = "Sun4m platform, SPARCClassic",
.init = scls_init,
- .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.use_scsi = 1,
};
@@ -1095,7 +1084,6 @@ QEMUMachine sbook_machine = {
.name = "SPARCbook",
.desc = "Sun4m platform, SPARCbook",
.init = sbook_init,
- .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.use_scsi = 1,
};
@@ -1348,7 +1336,6 @@ QEMUMachine ss1000_machine = {
.name = "SS-1000",
.desc = "Sun4d platform, SPARCserver 1000",
.init = ss1000_init,
- .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.use_scsi = 1,
.max_cpus = 8,
};
@@ -1357,7 +1344,6 @@ QEMUMachine ss2000_machine = {
.name = "SS-2000",
.desc = "Sun4d platform, SPARCcenter 2000",
.init = ss2000_init,
- .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.use_scsi = 1,
.max_cpus = 20,
};
@@ -1566,6 +1552,5 @@ QEMUMachine ss2_machine = {
.name = "SS-2",
.desc = "Sun4c platform, SPARCstation 2",
.init = ss2_init,
- .ram_require = PROM_SIZE_MAX + TCX_SIZE,
.use_scsi = 1,
};
diff --git a/hw/sun4u.c b/hw/sun4u.c
index 75f51b85637..de635d42938 100644
--- a/hw/sun4u.c
+++ b/hw/sun4u.c
@@ -593,7 +593,6 @@ QEMUMachine sun4u_machine = {
.name = "sun4u",
.desc = "Sun4u platform",
.init = sun4u_init,
- .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE,
.max_cpus = 1, // XXX for now
};
@@ -601,7 +600,6 @@ QEMUMachine sun4v_machine = {
.name = "sun4v",
.desc = "Sun4v platform",
.init = sun4v_init,
- .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE,
.max_cpus = 1, // XXX for now
};
@@ -609,6 +607,5 @@ QEMUMachine niagara_machine = {
.name = "Niagara",
.desc = "Sun4v platform, Niagara",
.init = niagara_init,
- .ram_require = PROM_SIZE_MAX + VGA_RAM_SIZE,
.max_cpus = 1, // XXX for now
};
diff --git a/hw/tosa.c b/hw/tosa.c
index de308a9d8eb..0182e711565 100644
--- a/hw/tosa.c
+++ b/hw/tosa.c
@@ -240,5 +240,4 @@ QEMUMachine tosapda_machine = {
.name = "tosa",
.desc = "Tosa PDA (PXA255)",
.init = tosa_init,
- .ram_require = TOSA_RAM + TOSA_ROM + PXA2XX_INTERNAL_SIZE + RAMSIZE_FIXED + TC6393XB_RAM,
};
--
GitLab