ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

arm: aspeed: Set SDRAM size 

We currently use Qemu's default of 128MB. As we know how much ram each
machine ships with, make it easier on users by setting a default.

It can still be overridden with -m on the command line.

Signed-off-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Andrew Jeffery <andrew@aj.id.au>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20190503022958.1394-1-joel@jms.id.au
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Joel Stanley 2019-05-07 12:55:02 +01:00 committed by Peter Maydell
parent b698e4eef5
commit a9df9622bc
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/arm/aspeed.c
View File

@ -25,6 +25,7 @@
#include "sysemu/block-backend.h" #include "sysemu/block-backend.h"
#include "hw/loader.h" #include "hw/loader.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "qemu/units.h"
static struct arm_boot_info aspeed_board_binfo = { static struct arm_boot_info aspeed_board_binfo = {
.board_id = -1, /* device-tree-only board */ .board_id = -1, /* device-tree-only board */
@ -331,6 +332,9 @@ static void aspeed_machine_class_init(ObjectClass *oc, void *data)
mc->no_floppy = 1; mc->no_floppy = 1;
mc->no_cdrom = 1; mc->no_cdrom = 1;
mc->no_parallel = 1; mc->no_parallel = 1;
if (board->ram) {
mc->default_ram_size = board->ram;
}
amc->board = board; amc->board = board;
} }
@ -352,6 +356,7 @@ static const AspeedBoardConfig aspeed_boards[] = {
.spi_model = "mx25l25635e", .spi_model = "mx25l25635e",
.num_cs = 1, .num_cs = 1,
.i2c_init = palmetto_bmc_i2c_init, .i2c_init = palmetto_bmc_i2c_init,
.ram = 256 * MiB,
}, { }, {
.name = MACHINE_TYPE_NAME("ast2500-evb"), .name = MACHINE_TYPE_NAME("ast2500-evb"),
.desc = "Aspeed AST2500 EVB (ARM1176)", .desc = "Aspeed AST2500 EVB (ARM1176)",
@ -361,6 +366,7 @@ static const AspeedBoardConfig aspeed_boards[] = {
.spi_model = "mx25l25635e", .spi_model = "mx25l25635e",
.num_cs = 1, .num_cs = 1,
.i2c_init = ast2500_evb_i2c_init, .i2c_init = ast2500_evb_i2c_init,
.ram = 512 * MiB,
}, { }, {
.name = MACHINE_TYPE_NAME("romulus-bmc"), .name = MACHINE_TYPE_NAME("romulus-bmc"),
.desc = "OpenPOWER Romulus BMC (ARM1176)", .desc = "OpenPOWER Romulus BMC (ARM1176)",
@ -370,6 +376,7 @@ static const AspeedBoardConfig aspeed_boards[] = {
.spi_model = "mx66l1g45g", .spi_model = "mx66l1g45g",
.num_cs = 2, .num_cs = 2,
.i2c_init = romulus_bmc_i2c_init, .i2c_init = romulus_bmc_i2c_init,
.ram = 512 * MiB,
}, { }, {
.name = MACHINE_TYPE_NAME("witherspoon-bmc"), .name = MACHINE_TYPE_NAME("witherspoon-bmc"),
.desc = "OpenPOWER Witherspoon BMC (ARM1176)", .desc = "OpenPOWER Witherspoon BMC (ARM1176)",
@ -379,6 +386,7 @@ static const AspeedBoardConfig aspeed_boards[] = {
.spi_model = "mx66l1g45g", .spi_model = "mx66l1g45g",
.num_cs = 2, .num_cs = 2,
.i2c_init = witherspoon_bmc_i2c_init, .i2c_init = witherspoon_bmc_i2c_init,
.ram = 512 * MiB,
}, },
}; };

1
include/hw/arm/aspeed.h
View File

@ -22,6 +22,7 @@ typedef struct AspeedBoardConfig {
const char *spi_model; const char *spi_model;
uint32_t num_cs; uint32_t num_cs;
void (*i2c_init)(AspeedBoardState *bmc); void (*i2c_init)(AspeedBoardState *bmc);
uint32_t ram;
} AspeedBoardConfig; } AspeedBoardConfig;
#define TYPE_ASPEED_MACHINE MACHINE_TYPE_NAME("aspeed") #define TYPE_ASPEED_MACHINE MACHINE_TYPE_NAME("aspeed")