On Wed, 1 May 2019, at 15:48, Joel Stanley wrote:
> 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 <j...@jms.id.au>
Reviewed-by: Andrew Jeffery <and...@aj.id.au>
> ---
> hw/arm/aspeed.c | 6 ++++++
> include/hw/arm/aspeed.h | 1 +
> 2 files changed, 7 insertions(+)
>
> diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
> index 1c23ebd99252..3f3d4162b3c5 100644
> --- a/hw/arm/aspeed.c
> +++ b/hw/arm/aspeed.c
> @@ -331,6 +331,8 @@ static void aspeed_machine_class_init(ObjectClass
> *oc, void *data)
> mc->no_floppy = 1;
> mc->no_cdrom = 1;
> mc->no_parallel = 1;
> + if (board->ram)
> + mc->default_ram_size = board->ram;
> amc->board = board;
> }
>
> @@ -352,6 +354,7 @@ static const AspeedBoardConfig aspeed_boards[] = {
> .spi_model = "mx25l25635e",
> .num_cs = 1,
> .i2c_init = palmetto_bmc_i2c_init,
> + .ram = 256 << 20,
> }, {
> .name = MACHINE_TYPE_NAME("ast2500-evb"),
> .desc = "Aspeed AST2500 EVB (ARM1176)",
> @@ -361,6 +364,7 @@ static const AspeedBoardConfig aspeed_boards[] = {
> .spi_model = "mx25l25635e",
> .num_cs = 1,
> .i2c_init = ast2500_evb_i2c_init,
> + .ram = 512 << 20,
> }, {
> .name = MACHINE_TYPE_NAME("romulus-bmc"),
> .desc = "OpenPOWER Romulus BMC (ARM1176)",
> @@ -370,6 +374,7 @@ static const AspeedBoardConfig aspeed_boards[] = {
> .spi_model = "mx66l1g45g",
> .num_cs = 2,
> .i2c_init = romulus_bmc_i2c_init,
> + .ram = 512 << 20,
> }, {
> .name = MACHINE_TYPE_NAME("witherspoon-bmc"),
> .desc = "OpenPOWER Witherspoon BMC (ARM1176)",
> @@ -379,6 +384,7 @@ static const AspeedBoardConfig aspeed_boards[] = {
> .spi_model = "mx66l1g45g",
> .num_cs = 2,
> .i2c_init = witherspoon_bmc_i2c_init,
> + .ram = 512 << 20,
> },
> };
>
> diff --git a/include/hw/arm/aspeed.h b/include/hw/arm/aspeed.h
> index 325c091d09e4..02073a6b4d61 100644
> --- a/include/hw/arm/aspeed.h
> +++ b/include/hw/arm/aspeed.h
> @@ -22,6 +22,7 @@ typedef struct AspeedBoardConfig {
> const char *spi_model;
> uint32_t num_cs;
> void (*i2c_init)(AspeedBoardState *bmc);
> + uint32_t ram;
> } AspeedBoardConfig;
>
> #define TYPE_ASPEED_MACHINE MACHINE_TYPE_NAME("aspeed")
> --
> 2.20.1
>
>