Re: [Qemu-devel] [PATCH v3 04/10] palmetto-bmc: rename the Aspeed board file to aspeed.c

[Andrew Jeffery]

On Tue, 2016-08-02 at 19:15 +0200, Cédric Le Goater wrote:
> We plan to add more Aspeed boards to this file. There are no changes
> in the code.
> 
> Signed-off-by: Cédric Le Goater <address@hidden>

Reviewed-by: Andrew Jeffery <address@hidden>

> ---
>  hw/arm/Makefile.objs  |   2 +-
>  hw/arm/aspeed.c       | 106 
> ++++++++++++++++++++++++++++++++++++++++++++++++++
>  hw/arm/palmetto-bmc.c | 106 
> --------------------------------------------------
>  3 files changed, 107 insertions(+), 107 deletions(-)
>  create mode 100644 hw/arm/aspeed.c
>  delete mode 100644 hw/arm/palmetto-bmc.c
> 
> diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
> index 7901294630b1..4c5c4ee76c12 100644
> --- a/hw/arm/Makefile.objs
> +++ b/hw/arm/Makefile.objs
> @@ -17,4 +17,4 @@ obj-$(CONFIG_XLNX_ZYNQMP) += xlnx-zynqmp.o xlnx-ep108.o
>  obj-$(CONFIG_FSL_IMX25) += fsl-imx25.o imx25_pdk.o
>  obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o
>  obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o sabrelite.o
> -obj-$(CONFIG_ASPEED_SOC) += aspeed_soc.o palmetto-bmc.o
> +obj-$(CONFIG_ASPEED_SOC) += aspeed_soc.o aspeed.o
> diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
> new file mode 100644
> index 000000000000..531c266d9449
> --- /dev/null
> +++ b/hw/arm/aspeed.c
> @@ -0,0 +1,106 @@
> +/*
> + * OpenPOWER Palmetto BMC
> + *
> + * Andrew Jeffery <address@hidden>
> + *
> + * Copyright 2016 IBM Corp.
> + *
> + * This code is licensed under the GPL version 2 or later.  See
> + * the COPYING file in the top-level directory.
> + */
> +
> +#include "qemu/osdep.h"
> +#include "qapi/error.h"
> +#include "qemu-common.h"
> +#include "cpu.h"
> +#include "exec/address-spaces.h"
> +#include "hw/arm/arm.h"
> +#include "hw/arm/aspeed_soc.h"
> +#include "hw/boards.h"
> +#include "qemu/log.h"
> +#include "sysemu/block-backend.h"
> +#include "sysemu/blockdev.h"
> +
> +static struct arm_boot_info palmetto_bmc_binfo = {
> +    .nb_cpus = 1,
> +};
> +
> +typedef struct PalmettoBMCState {
> +    AspeedSoCState soc;
> +    MemoryRegion ram;
> +} PalmettoBMCState;
> +
> +static void palmetto_bmc_init_flashes(AspeedSMCState *s, const char 
> *flashtype,
> +                                      Error **errp)
> +{
> +    int i ;
> +
> +    for (i = 0; i < s->num_cs; ++i) {
> +        AspeedSMCFlash *fl = &s->flashes[i];
> +        DriveInfo *dinfo = drive_get_next(IF_MTD);
> +        qemu_irq cs_line;
> +
> +        /*
> +         * FIXME: check that we are not using a flash module exceeding
> +         * the controller segment size
> +         */
> +        fl->flash = ssi_create_slave_no_init(s->spi, flashtype);
> +        if (dinfo) {
> +            qdev_prop_set_drive(fl->flash, "drive", 
> blk_by_legacy_dinfo(dinfo),
> +                                errp);
> +        }
> +        qdev_init_nofail(fl->flash);
> +
> +        cs_line = qdev_get_gpio_in_named(fl->flash, SSI_GPIO_CS, 0);
> +        sysbus_connect_irq(SYS_BUS_DEVICE(s), i + 1, cs_line);
> +    }
> +}
> +
> +static void palmetto_bmc_init(MachineState *machine)
> +{
> +    PalmettoBMCState *bmc;
> +    AspeedSoCClass *sc;
> +
> +    bmc = g_new0(PalmettoBMCState, 1);
> +    object_initialize(&bmc->soc, (sizeof(bmc->soc)), "ast2400-a0");
> +    object_property_add_child(OBJECT(machine), "soc", OBJECT(&bmc->soc),
> +                              &error_abort);
> +
> +    sc = ASPEED_SOC_GET_CLASS(&bmc->soc);
> +
> +    memory_region_allocate_system_memory(&bmc->ram, NULL, "ram", ram_size);
> +    memory_region_add_subregion(get_system_memory(), sc->info->sdram_base,
> +                                &bmc->ram);
> +    object_property_add_const_link(OBJECT(&bmc->soc), "ram", 
> OBJECT(&bmc->ram),
> +                                   &error_abort);
> +    object_property_set_int(OBJECT(&bmc->soc), 0x120CE416, "hw-strap1",
> +                            &error_abort);
> +    object_property_set_bool(OBJECT(&bmc->soc), true, "realized",
> +                             &error_abort);
> +
> +    palmetto_bmc_init_flashes(&bmc->soc.smc, "n25q256a", &error_abort);
> +    palmetto_bmc_init_flashes(&bmc->soc.spi, "mx25l25635e", &error_abort);
> +
> +    palmetto_bmc_binfo.kernel_filename = machine->kernel_filename;
> +    palmetto_bmc_binfo.initrd_filename = machine->initrd_filename;
> +    palmetto_bmc_binfo.kernel_cmdline = machine->kernel_cmdline;
> +    palmetto_bmc_binfo.ram_size = ram_size;
> +    palmetto_bmc_binfo.board_id = sc->info->silicon_rev;
> +    palmetto_bmc_binfo.loader_start = sc->info->sdram_base;
> +
> +    arm_load_kernel(ARM_CPU(first_cpu), &palmetto_bmc_binfo);
> +}
> +
> +static void palmetto_bmc_machine_init(MachineClass *mc)
> +{
> +    mc->desc = "OpenPOWER Palmetto BMC";
> +    mc->init = palmetto_bmc_init;
> +    mc->max_cpus = 1;
> +    mc->no_sdcard = 1;
> +    mc->no_floppy = 1;
> +    mc->no_cdrom = 1;
> +    mc->no_sdcard = 1;
> +    mc->no_parallel = 1;
> +}
> +
> +DEFINE_MACHINE("palmetto-bmc", palmetto_bmc_machine_init);
> diff --git a/hw/arm/palmetto-bmc.c b/hw/arm/palmetto-bmc.c
> deleted file mode 100644
> index 531c266d9449..000000000000
> --- a/hw/arm/palmetto-bmc.c
> +++ /dev/null
> @@ -1,106 +0,0 @@
> -/*
> - * OpenPOWER Palmetto BMC
> - *
> - * Andrew Jeffery <address@hidden>
> - *
> - * Copyright 2016 IBM Corp.
> - *
> - * This code is licensed under the GPL version 2 or later.  See
> - * the COPYING file in the top-level directory.
> - */
> -
> -#include "qemu/osdep.h"
> -#include "qapi/error.h"
> -#include "qemu-common.h"
> -#include "cpu.h"
> -#include "exec/address-spaces.h"
> -#include "hw/arm/arm.h"
> -#include "hw/arm/aspeed_soc.h"
> -#include "hw/boards.h"
> -#include "qemu/log.h"
> -#include "sysemu/block-backend.h"
> -#include "sysemu/blockdev.h"
> -
> -static struct arm_boot_info palmetto_bmc_binfo = {
> -    .nb_cpus = 1,
> -};
> -
> -typedef struct PalmettoBMCState {
> -    AspeedSoCState soc;
> -    MemoryRegion ram;
> -} PalmettoBMCState;
> -
> -static void palmetto_bmc_init_flashes(AspeedSMCState *s, const char 
> *flashtype,
> -                                      Error **errp)
> -{
> -    int i ;
> -
> -    for (i = 0; i < s->num_cs; ++i) {
> -        AspeedSMCFlash *fl = &s->flashes[i];
> -        DriveInfo *dinfo = drive_get_next(IF_MTD);
> -        qemu_irq cs_line;
> -
> -        /*
> -         * FIXME: check that we are not using a flash module exceeding
> -         * the controller segment size
> -         */
> -        fl->flash = ssi_create_slave_no_init(s->spi, flashtype);
> -        if (dinfo) {
> -            qdev_prop_set_drive(fl->flash, "drive", 
> blk_by_legacy_dinfo(dinfo),
> -                                errp);
> -        }
> -        qdev_init_nofail(fl->flash);
> -
> -        cs_line = qdev_get_gpio_in_named(fl->flash, SSI_GPIO_CS, 0);
> -        sysbus_connect_irq(SYS_BUS_DEVICE(s), i + 1, cs_line);
> -    }
> -}
> -
> -static void palmetto_bmc_init(MachineState *machine)
> -{
> -    PalmettoBMCState *bmc;
> -    AspeedSoCClass *sc;
> -
> -    bmc = g_new0(PalmettoBMCState, 1);
> -    object_initialize(&bmc->soc, (sizeof(bmc->soc)), "ast2400-a0");
> -    object_property_add_child(OBJECT(machine), "soc", OBJECT(&bmc->soc),
> -                              &error_abort);
> -
> -    sc = ASPEED_SOC_GET_CLASS(&bmc->soc);
> -
> -    memory_region_allocate_system_memory(&bmc->ram, NULL, "ram", ram_size);
> -    memory_region_add_subregion(get_system_memory(), sc->info->sdram_base,
> -                                &bmc->ram);
> -    object_property_add_const_link(OBJECT(&bmc->soc), "ram", 
> OBJECT(&bmc->ram),
> -                                   &error_abort);
> -    object_property_set_int(OBJECT(&bmc->soc), 0x120CE416, "hw-strap1",
> -                            &error_abort);
> -    object_property_set_bool(OBJECT(&bmc->soc), true, "realized",
> -                             &error_abort);
> -
> -    palmetto_bmc_init_flashes(&bmc->soc.smc, "n25q256a", &error_abort);
> -    palmetto_bmc_init_flashes(&bmc->soc.spi, "mx25l25635e", &error_abort);
> -
> -    palmetto_bmc_binfo.kernel_filename = machine->kernel_filename;
> -    palmetto_bmc_binfo.initrd_filename = machine->initrd_filename;
> -    palmetto_bmc_binfo.kernel_cmdline = machine->kernel_cmdline;
> -    palmetto_bmc_binfo.ram_size = ram_size;
> -    palmetto_bmc_binfo.board_id = sc->info->silicon_rev;
> -    palmetto_bmc_binfo.loader_start = sc->info->sdram_base;
> -
> -    arm_load_kernel(ARM_CPU(first_cpu), &palmetto_bmc_binfo);
> -}
> -
> -static void palmetto_bmc_machine_init(MachineClass *mc)
> -{
> -    mc->desc = "OpenPOWER Palmetto BMC";
> -    mc->init = palmetto_bmc_init;
> -    mc->max_cpus = 1;
> -    mc->no_sdcard = 1;
> -    mc->no_floppy = 1;
> -    mc->no_cdrom = 1;
> -    mc->no_sdcard = 1;
> -    mc->no_parallel = 1;
> -}
> -
> -DEFINE_MACHINE("palmetto-bmc", palmetto_bmc_machine_init);

signature.asc
Description: This is a digitally signed message part