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

1 files changed, 0 insertions, 15 deletions

diff --git a/hw/sun4m.c b/hw/sun4m.c
index a459055..1f1efd0 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,
 };