On Tue, 2016-08-02 at 19:15 +0200, Cédric Le Goater wrote: > The ast2500 eval board has a hardware strapping register value of > 0xF100C2E6 which we use for a definition of AST2500_EVB_HW_STRAP1 > below. > > Signed-off-by: Cédric Le Goater <c...@kaod.org>
Reviewed-by: Andrew Jeffery <and...@aj.id.au>
> ---
>
> Changes since v2:
>
> - removed silicon-rev and cpu-model. This is now in the SoC.
>
> Changes since v1:
>
> - changed AST2500_EDK to AST2500_EVB
> - fixed white space issues
> - added AST2500_HW_STRAP1
>
> hw/arm/aspeed.c | 39 ++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 38 insertions(+), 1 deletion(-)
>
> diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
> index 80907b4244ea..e71500c64bd3 100644
> --- a/hw/arm/aspeed.c
> +++ b/hw/arm/aspeed.c
> @@ -36,7 +36,8 @@ typedef struct AspeedBoardConfig {
> } AspeedBoardConfig;
>
> enum {
> - PALMETTO_BMC
> + PALMETTO_BMC,
> + AST2500_EVB
> };
>
> #define PALMETTO_BMC_HW_STRAP1 ( \
> @@ -52,8 +53,19 @@ enum {
> SCU_HW_STRAP_VGA_SIZE_SET(VGA_16M_DRAM) | \
> SCU_AST2400_HW_STRAP_BOOT_MODE(AST2400_SPI_BOOT))
>
> +#define AST2500_EVB_HW_STRAP1 (( \
> + AST2500_HW_STRAP1_DEFAULTS | \
> + SCU_AST2500_HW_STRAP_SPI_AUTOFETCH_ENABLE | \
> + SCU_AST2500_HW_STRAP_GPIO_STRAP_ENABLE | \
> + SCU_AST2500_HW_STRAP_UART_DEBUG | \
> + SCU_AST2500_HW_STRAP_DDR4_ENABLE | \
> + SCU_HW_STRAP_MAC1_RGMII | \
> + SCU_HW_STRAP_MAC0_RGMII) & \
> + ~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 },
> };
>
> static void aspeed_board_init_flashes(AspeedSMCState *s, const char
> *flashtype,
> @@ -143,9 +155,34 @@ static const TypeInfo palmetto_bmc_type = {
> .class_init = palmetto_bmc_class_init,
> };
>
> +static void ast2500_evb_init(MachineState *machine)
> +{
> + aspeed_board_init(machine, &aspeed_boards[AST2500_EVB]);
> +}
> +
> +static void ast2500_evb_class_init(ObjectClass *oc, void *data)
> +{
> + MachineClass *mc = MACHINE_CLASS(oc);
> +
> + mc->desc = "Aspeed AST2500 EVB (ARM1176)";
> + mc->init = ast2500_evb_init;
> + mc->max_cpus = 1;
> + mc->no_sdcard = 1;
> + mc->no_floppy = 1;
> + mc->no_cdrom = 1;
> + mc->no_parallel = 1;
> +}
> +
> +static const TypeInfo ast2500_evb_type = {
> + .name = MACHINE_TYPE_NAME("ast2500-evb"),
> + .parent = TYPE_MACHINE,
> + .class_init = ast2500_evb_class_init,
> +};
> +
> static void aspeed_machine_init(void)
> {
> type_register_static(&palmetto_bmc_type);
> + type_register_static(&ast2500_evb_type);
> }
>
> type_init(aspeed_machine_init)
signature.asc
Description: This is a digitally signed message part
