Message ID | 20220216080354.65257-1-joel@jms.id.au (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | arm: Remove swift-bmc machine | expand |
On 2/16/22 09:03, Joel Stanley wrote: > It was scheduled for removal in 7.0. > > Signed-off-by: Joel Stanley <joel@jms.id.au> Could you please send a v2 with an update of docs/about/deprecated.rst ? With that, Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. > --- > docs/system/arm/aspeed.rst | 1 - > hw/arm/aspeed.c | 53 -------------------------------------- > 2 files changed, 54 deletions(-) > > diff --git a/docs/system/arm/aspeed.rst b/docs/system/arm/aspeed.rst > index d8b102fa0ad0..60ed94f18759 100644 > --- a/docs/system/arm/aspeed.rst > +++ b/docs/system/arm/aspeed.rst > @@ -22,7 +22,6 @@ AST2500 SoC based machines : > - ``romulus-bmc`` OpenPOWER Romulus POWER9 BMC > - ``witherspoon-bmc`` OpenPOWER Witherspoon POWER9 BMC > - ``sonorapass-bmc`` OCP SonoraPass BMC > -- ``swift-bmc`` OpenPOWER Swift BMC POWER9 (to be removed in v7.0) > - ``fp5280g2-bmc`` Inspur FP5280G2 BMC > - ``g220a-bmc`` Bytedance G220A BMC > > diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c > index d911dc904fb3..9789a489047b 100644 > --- a/hw/arm/aspeed.c > +++ b/hw/arm/aspeed.c > @@ -544,35 +544,6 @@ static void romulus_bmc_i2c_init(AspeedMachineState *bmc) > i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 11), "ds1338", 0x32); > } > > -static void swift_bmc_i2c_init(AspeedMachineState *bmc) > -{ > - AspeedSoCState *soc = &bmc->soc; > - > - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 3), "pca9552", 0x60); > - > - /* The swift board expects a TMP275 but a TMP105 is compatible */ > - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 7), "tmp105", 0x48); > - /* The swift board expects a pca9551 but a pca9552 is compatible */ > - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 7), "pca9552", 0x60); > - > - /* The swift board expects an Epson RX8900 RTC but a ds1338 is compatible */ > - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8), "ds1338", 0x32); > - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8), "pca9552", 0x60); > - > - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 9), "tmp423", 0x4c); > - /* The swift board expects a pca9539 but a pca9552 is compatible */ > - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 9), "pca9552", 0x74); > - > - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 10), "tmp423", 0x4c); > - /* The swift board expects a pca9539 but a pca9552 is compatible */ > - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 10), "pca9552", > - 0x74); > - > - /* The swift board expects a TMP275 but a TMP105 is compatible */ > - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 12), "tmp105", 0x48); > - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 12), "tmp105", 0x4a); > -} > - > static void sonorapass_bmc_i2c_init(AspeedMachineState *bmc) > { > AspeedSoCState *soc = &bmc->soc; > @@ -1102,26 +1073,6 @@ static void aspeed_machine_sonorapass_class_init(ObjectClass *oc, void *data) > aspeed_soc_num_cpus(amc->soc_name); > }; > > -static void aspeed_machine_swift_class_init(ObjectClass *oc, void *data) > -{ > - MachineClass *mc = MACHINE_CLASS(oc); > - AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc); > - > - mc->desc = "OpenPOWER Swift BMC (ARM1176)"; > - amc->soc_name = "ast2500-a1"; > - amc->hw_strap1 = SWIFT_BMC_HW_STRAP1; > - amc->fmc_model = "mx66l1g45g"; > - amc->spi_model = "mx66l1g45g"; > - amc->num_cs = 2; > - amc->i2c_init = swift_bmc_i2c_init; > - mc->default_ram_size = 512 * MiB; > - mc->default_cpus = mc->min_cpus = mc->max_cpus = > - aspeed_soc_num_cpus(amc->soc_name); > - > - mc->deprecation_reason = "redundant system. Please use a similar " > - "OpenPOWER BMC, Witherspoon or Romulus."; > -}; > - > static void aspeed_machine_witherspoon_class_init(ObjectClass *oc, void *data) > { > MachineClass *mc = MACHINE_CLASS(oc); > @@ -1277,10 +1228,6 @@ static const TypeInfo aspeed_machine_types[] = { > .name = MACHINE_TYPE_NAME("romulus-bmc"), > .parent = TYPE_ASPEED_MACHINE, > .class_init = aspeed_machine_romulus_class_init, > - }, { > - .name = MACHINE_TYPE_NAME("swift-bmc"), > - .parent = TYPE_ASPEED_MACHINE, > - .class_init = aspeed_machine_swift_class_init, > }, { > .name = MACHINE_TYPE_NAME("sonorapass-bmc"), > .parent = TYPE_ASPEED_MACHINE,
On Wed, 16 Feb 2022 at 08:07, Cédric Le Goater <clg@kaod.org> wrote: > > On 2/16/22 09:03, Joel Stanley wrote: > > It was scheduled for removal in 7.0. > > > > Signed-off-by: Joel Stanley <joel@jms.id.au> > > Could you please send a v2 with an update of docs/about/deprecated.rst ? Sure. Do we remove the machine from the list once they're gone? > > With that, > > Reviewed-by: Cédric Le Goater <clg@kaod.org> > > Thanks, > > C. > > > --- > > docs/system/arm/aspeed.rst | 1 - > > hw/arm/aspeed.c | 53 -------------------------------------- > > 2 files changed, 54 deletions(-) > > > > diff --git a/docs/system/arm/aspeed.rst b/docs/system/arm/aspeed.rst > > index d8b102fa0ad0..60ed94f18759 100644 > > --- a/docs/system/arm/aspeed.rst > > +++ b/docs/system/arm/aspeed.rst > > @@ -22,7 +22,6 @@ AST2500 SoC based machines : > > - ``romulus-bmc`` OpenPOWER Romulus POWER9 BMC > > - ``witherspoon-bmc`` OpenPOWER Witherspoon POWER9 BMC > > - ``sonorapass-bmc`` OCP SonoraPass BMC > > -- ``swift-bmc`` OpenPOWER Swift BMC POWER9 (to be removed in v7.0) > > - ``fp5280g2-bmc`` Inspur FP5280G2 BMC > > - ``g220a-bmc`` Bytedance G220A BMC > > > > diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c > > index d911dc904fb3..9789a489047b 100644 > > --- a/hw/arm/aspeed.c > > +++ b/hw/arm/aspeed.c > > @@ -544,35 +544,6 @@ static void romulus_bmc_i2c_init(AspeedMachineState *bmc) > > i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 11), "ds1338", 0x32); > > } > > > > -static void swift_bmc_i2c_init(AspeedMachineState *bmc) > > -{ > > - AspeedSoCState *soc = &bmc->soc; > > - > > - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 3), "pca9552", 0x60); > > - > > - /* The swift board expects a TMP275 but a TMP105 is compatible */ > > - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 7), "tmp105", 0x48); > > - /* The swift board expects a pca9551 but a pca9552 is compatible */ > > - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 7), "pca9552", 0x60); > > - > > - /* The swift board expects an Epson RX8900 RTC but a ds1338 is compatible */ > > - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8), "ds1338", 0x32); > > - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8), "pca9552", 0x60); > > - > > - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 9), "tmp423", 0x4c); > > - /* The swift board expects a pca9539 but a pca9552 is compatible */ > > - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 9), "pca9552", 0x74); > > - > > - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 10), "tmp423", 0x4c); > > - /* The swift board expects a pca9539 but a pca9552 is compatible */ > > - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 10), "pca9552", > > - 0x74); > > - > > - /* The swift board expects a TMP275 but a TMP105 is compatible */ > > - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 12), "tmp105", 0x48); > > - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 12), "tmp105", 0x4a); > > -} > > - > > static void sonorapass_bmc_i2c_init(AspeedMachineState *bmc) > > { > > AspeedSoCState *soc = &bmc->soc; > > @@ -1102,26 +1073,6 @@ static void aspeed_machine_sonorapass_class_init(ObjectClass *oc, void *data) > > aspeed_soc_num_cpus(amc->soc_name); > > }; > > > > -static void aspeed_machine_swift_class_init(ObjectClass *oc, void *data) > > -{ > > - MachineClass *mc = MACHINE_CLASS(oc); > > - AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc); > > - > > - mc->desc = "OpenPOWER Swift BMC (ARM1176)"; > > - amc->soc_name = "ast2500-a1"; > > - amc->hw_strap1 = SWIFT_BMC_HW_STRAP1; > > - amc->fmc_model = "mx66l1g45g"; > > - amc->spi_model = "mx66l1g45g"; > > - amc->num_cs = 2; > > - amc->i2c_init = swift_bmc_i2c_init; > > - mc->default_ram_size = 512 * MiB; > > - mc->default_cpus = mc->min_cpus = mc->max_cpus = > > - aspeed_soc_num_cpus(amc->soc_name); > > - > > - mc->deprecation_reason = "redundant system. Please use a similar " > > - "OpenPOWER BMC, Witherspoon or Romulus."; > > -}; > > - > > static void aspeed_machine_witherspoon_class_init(ObjectClass *oc, void *data) > > { > > MachineClass *mc = MACHINE_CLASS(oc); > > @@ -1277,10 +1228,6 @@ static const TypeInfo aspeed_machine_types[] = { > > .name = MACHINE_TYPE_NAME("romulus-bmc"), > > .parent = TYPE_ASPEED_MACHINE, > > .class_init = aspeed_machine_romulus_class_init, > > - }, { > > - .name = MACHINE_TYPE_NAME("swift-bmc"), > > - .parent = TYPE_ASPEED_MACHINE, > > - .class_init = aspeed_machine_swift_class_init, > > }, { > > .name = MACHINE_TYPE_NAME("sonorapass-bmc"), > > .parent = TYPE_ASPEED_MACHINE, >
On Wed, Feb 16, 2022 at 08:08:46AM +0000, Joel Stanley wrote: > On Wed, 16 Feb 2022 at 08:07, Cédric Le Goater <clg@kaod.org> wrote: > > > > On 2/16/22 09:03, Joel Stanley wrote: > > > It was scheduled for removal in 7.0. > > > > > > Signed-off-by: Joel Stanley <joel@jms.id.au> > > > > Could you please send a v2 with an update of docs/about/deprecated.rst ? > > Sure. Do we remove the machine from the list once they're gone? The note in deprecated.rst should be moved to removed-features.rst Regards, Daniel
diff --git a/docs/system/arm/aspeed.rst b/docs/system/arm/aspeed.rst index d8b102fa0ad0..60ed94f18759 100644 --- a/docs/system/arm/aspeed.rst +++ b/docs/system/arm/aspeed.rst @@ -22,7 +22,6 @@ AST2500 SoC based machines : - ``romulus-bmc`` OpenPOWER Romulus POWER9 BMC - ``witherspoon-bmc`` OpenPOWER Witherspoon POWER9 BMC - ``sonorapass-bmc`` OCP SonoraPass BMC -- ``swift-bmc`` OpenPOWER Swift BMC POWER9 (to be removed in v7.0) - ``fp5280g2-bmc`` Inspur FP5280G2 BMC - ``g220a-bmc`` Bytedance G220A BMC diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index d911dc904fb3..9789a489047b 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -544,35 +544,6 @@ static void romulus_bmc_i2c_init(AspeedMachineState *bmc) i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 11), "ds1338", 0x32); } -static void swift_bmc_i2c_init(AspeedMachineState *bmc) -{ - AspeedSoCState *soc = &bmc->soc; - - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 3), "pca9552", 0x60); - - /* The swift board expects a TMP275 but a TMP105 is compatible */ - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 7), "tmp105", 0x48); - /* The swift board expects a pca9551 but a pca9552 is compatible */ - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 7), "pca9552", 0x60); - - /* The swift board expects an Epson RX8900 RTC but a ds1338 is compatible */ - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8), "ds1338", 0x32); - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8), "pca9552", 0x60); - - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 9), "tmp423", 0x4c); - /* The swift board expects a pca9539 but a pca9552 is compatible */ - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 9), "pca9552", 0x74); - - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 10), "tmp423", 0x4c); - /* The swift board expects a pca9539 but a pca9552 is compatible */ - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 10), "pca9552", - 0x74); - - /* The swift board expects a TMP275 but a TMP105 is compatible */ - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 12), "tmp105", 0x48); - i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 12), "tmp105", 0x4a); -} - static void sonorapass_bmc_i2c_init(AspeedMachineState *bmc) { AspeedSoCState *soc = &bmc->soc; @@ -1102,26 +1073,6 @@ static void aspeed_machine_sonorapass_class_init(ObjectClass *oc, void *data) aspeed_soc_num_cpus(amc->soc_name); }; -static void aspeed_machine_swift_class_init(ObjectClass *oc, void *data) -{ - MachineClass *mc = MACHINE_CLASS(oc); - AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc); - - mc->desc = "OpenPOWER Swift BMC (ARM1176)"; - amc->soc_name = "ast2500-a1"; - amc->hw_strap1 = SWIFT_BMC_HW_STRAP1; - amc->fmc_model = "mx66l1g45g"; - amc->spi_model = "mx66l1g45g"; - amc->num_cs = 2; - amc->i2c_init = swift_bmc_i2c_init; - mc->default_ram_size = 512 * MiB; - mc->default_cpus = mc->min_cpus = mc->max_cpus = - aspeed_soc_num_cpus(amc->soc_name); - - mc->deprecation_reason = "redundant system. Please use a similar " - "OpenPOWER BMC, Witherspoon or Romulus."; -}; - static void aspeed_machine_witherspoon_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -1277,10 +1228,6 @@ static const TypeInfo aspeed_machine_types[] = { .name = MACHINE_TYPE_NAME("romulus-bmc"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_romulus_class_init, - }, { - .name = MACHINE_TYPE_NAME("swift-bmc"), - .parent = TYPE_ASPEED_MACHINE, - .class_init = aspeed_machine_swift_class_init, }, { .name = MACHINE_TYPE_NAME("sonorapass-bmc"), .parent = TYPE_ASPEED_MACHINE,
It was scheduled for removal in 7.0. Signed-off-by: Joel Stanley <joel@jms.id.au> --- docs/system/arm/aspeed.rst | 1 - hw/arm/aspeed.c | 53 -------------------------------------- 2 files changed, 54 deletions(-)