diff options
| author | Jamin Lin <jamin_lin@aspeedtech.com> | 2024-10-29 17:17:29 +0800 |
|---|---|---|
| committer | Cédric Le Goater <clg@redhat.com> | 2024-11-04 11:33:13 +0100 |
| commit | 22b3c557ffd4fb9c6c034a839b3e5b82d131123a (patch) | |
| tree | 4c4ab2bf0f4715d9d3beed07fde60ef9d29a87d5 /hw/arm/aspeed.c | |
| parent | 53b316926969d55646b5d6dd8f49e74e440a44f1 (diff) | |
| download | focaccia-qemu-22b3c557ffd4fb9c6c034a839b3e5b82d131123a.tar.gz focaccia-qemu-22b3c557ffd4fb9c6c034a839b3e5b82d131123a.zip | |
aspeed: Support create flash devices via command line for AST1030
Add a "if-statement" in aspeed_minibmc_machine_init function. If users add "-nodefaults" in command line, the flash devices should be created by users setting. Otherwise, the flash devices are created at machine init. Signed-off-by: Jamin Lin <jamin_lin@aspeedtech.com> Reviewed-by: Cédric Le Goater <clg@redhat.com>
Diffstat (limited to 'hw/arm/aspeed.c')
| -rw-r--r-- | hw/arm/aspeed.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index b4b1ce9efb..e447923536 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -1594,18 +1594,20 @@ static void aspeed_minibmc_machine_init(MachineState *machine) connect_serial_hds_to_uarts(bmc); qdev_realize(DEVICE(bmc->soc), NULL, &error_abort); - aspeed_board_init_flashes(&bmc->soc->fmc, - bmc->fmc_model ? bmc->fmc_model : amc->fmc_model, - amc->num_cs, - 0); + if (defaults_enabled()) { + aspeed_board_init_flashes(&bmc->soc->fmc, + bmc->fmc_model ? bmc->fmc_model : amc->fmc_model, + amc->num_cs, + 0); - aspeed_board_init_flashes(&bmc->soc->spi[0], - bmc->spi_model ? bmc->spi_model : amc->spi_model, - amc->num_cs, amc->num_cs); + aspeed_board_init_flashes(&bmc->soc->spi[0], + bmc->spi_model ? bmc->spi_model : amc->spi_model, + amc->num_cs, amc->num_cs); - aspeed_board_init_flashes(&bmc->soc->spi[1], - bmc->spi_model ? bmc->spi_model : amc->spi_model, - amc->num_cs, (amc->num_cs * 2)); + aspeed_board_init_flashes(&bmc->soc->spi[1], + bmc->spi_model ? bmc->spi_model : amc->spi_model, + amc->num_cs, (amc->num_cs * 2)); + } if (amc->i2c_init) { amc->i2c_init(bmc); |