Commit 6a0e947b authored by Cédric Le Goater's avatar Cédric Le Goater Committed by Peter Maydell
Browse files

aspeed: extend the board configuration with flash models 



Future machine will use different flash models for the FMC and the SPI
controllers.

Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Reviewed-by: default avatarJoel Stanley <joel@jms.id.au>
Reviewed-by: default avatarAndrew Jeffery <andrew@aj.id.au>
Message-id: 1480434248-27138-7-git-send-email-clg@kaod.org
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent bd673bd8

hw/arm/aspeed.c

+16 −4
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ typedef struct AspeedBoardState { 
typedef struct AspeedBoardConfig {

    const char *soc_name;

    uint32_t hw_strap1;

    const char *fmc_model;

    const char *spi_model;

} AspeedBoardConfig;



enum {
@@ -65,8 +67,18 @@ enum { 
        ~SCU_HW_STRAP_2ND_BOOT_WDT)



static const AspeedBoardConfig aspeed_boards[] = {

    [PALMETTO_BMC] = { "ast2400-a0", PALMETTO_BMC_HW_STRAP1 },

    [AST2500_EVB]  = { "ast2500-a1", AST2500_EVB_HW_STRAP1 },

    [PALMETTO_BMC] = {

        .soc_name  = "ast2400-a0",

        .hw_strap1 = PALMETTO_BMC_HW_STRAP1,

        .fmc_model = "n25q256a",

        .spi_model = "mx25l25635e",

    },

    [AST2500_EVB]  = {

        .soc_name  = "ast2500-a1",

        .hw_strap1 = AST2500_EVB_HW_STRAP1,

        .fmc_model = "n25q256a",

        .spi_model = "mx25l25635e",

    },

};



static void aspeed_board_init_flashes(AspeedSMCState *s, const char *flashtype,
@@ -128,8 +140,8 @@ static void aspeed_board_init(MachineState *machine, 
    object_property_add_const_link(OBJECT(&bmc->soc), "ram", OBJECT(&bmc->ram),

                                   &error_abort);



    aspeed_board_init_flashes(&bmc->soc.fmc, "n25q256a", &error_abort);

    aspeed_board_init_flashes(&bmc->soc.spi[0], "mx25l25635e", &error_abort);

    aspeed_board_init_flashes(&bmc->soc.fmc, cfg->fmc_model, &error_abort);

    aspeed_board_init_flashes(&bmc->soc.spi[0], cfg->spi_model, &error_abort);



    aspeed_board_binfo.kernel_filename = machine->kernel_filename;

    aspeed_board_binfo.initrd_filename = machine->initrd_filename;