[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 09/11] hw/arm/aspeed: allow missing spi_model
From: |
Cédric Le Goater |
Subject: |
[PULL 09/11] hw/arm/aspeed: allow missing spi_model |
Date: |
Tue, 8 Mar 2022 13:21:47 +0100 |
From: Patrick Williams <patrick@stwcx.xyz>
Generally all BMCs will use the fmc_model to hold their own flash
and most will have a spi_model to hold the managed system's flash,
but not all systems do. Add a simple NULL check to allow a system
to set the spi_model as NULL to indicate it should not be instantiated.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Message-Id: <20220305000656.1944589-1-patrick@stwcx.xyz>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
hw/arm/aspeed.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index 90504ee44408..088550ed33b2 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -274,7 +274,11 @@ static void write_boot_rom(DriveInfo *dinfo, hwaddr addr,
size_t rom_size,
static void aspeed_board_init_flashes(AspeedSMCState *s, const char *flashtype,
unsigned int count, int unit0)
{
- int i ;
+ int i;
+
+ if (!flashtype) {
+ return;
+ }
for (i = 0; i < count; ++i) {
DriveInfo *dinfo = drive_get(IF_MTD, 0, unit0 + i);
--
2.34.1
- [PULL 00/11] aspeed queue, Cédric Le Goater, 2022/03/08
- [PULL 04/11] aspeed/smc: Remove 'num_cs' field, Cédric Le Goater, 2022/03/08
- [PULL 02/11] aspeed/smc: Use max number of CE instead of 'num_cs', Cédric Le Goater, 2022/03/08
- [PULL 11/11] hw: aspeed_gpio: Cleanup stray semicolon after switch, Cédric Le Goater, 2022/03/08
- [PULL 10/11] hw/arm/aspeed: add Bletchley machine type, Cédric Le Goater, 2022/03/08
- [PULL 07/11] aspeed/smc: Fix error log, Cédric Le Goater, 2022/03/08
- [PULL 05/11] aspeed/smc: Rename 'max_peripherals' to 'cs_num_max', Cédric Le Goater, 2022/03/08
- [PULL 03/11] aspeed: Rework aspeed_board_init_flashes() interface, Cédric Le Goater, 2022/03/08
- [PULL 09/11] hw/arm/aspeed: allow missing spi_model,
Cédric Le Goater <=
- [PULL 01/11] aspeed: Fix a potential memory leak bug in write_boot_rom(), Cédric Le Goater, 2022/03/08
- [PULL 06/11] aspeed/smc: Let the SSI core layer define the bus name, Cédric Le Goater, 2022/03/08
- [PULL 08/11] hw/block: m25p80: Add support for w25q01jvq, Cédric Le Goater, 2022/03/08
- Re: [PULL 00/11] aspeed queue, Peter Maydell, 2022/03/09