| Message ID | 20220624003701.1363500-7-pdel@fb.com |
|---|---|
| State | New |
| Headers | show |
| Series | aspeed: Add multi-SoC machine | expand |
On 6/24/22 02:36, Peter Delevoryas wrote: > Signed-off-by: Peter Delevoryas <pdel@fb.com> Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. > --- > MAINTAINERS | 1 + > hw/arm/fby35.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++ > hw/arm/meson.build | 3 ++- > 3 files changed, 57 insertions(+), 1 deletion(-) > create mode 100644 hw/arm/fby35.c > > diff --git a/MAINTAINERS b/MAINTAINERS > index aaa649a50d..b43b428a30 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1067,6 +1067,7 @@ F: hw/net/ftgmac100.c > F: include/hw/net/ftgmac100.h > F: docs/system/arm/aspeed.rst > F: tests/qtest/*aspeed* > +F: hw/arm/fby35.c > > NRF51 > M: Joel Stanley <joel@jms.id.au> > diff --git a/hw/arm/fby35.c b/hw/arm/fby35.c > new file mode 100644 > index 0000000000..dc1ae8e62a > --- /dev/null > +++ b/hw/arm/fby35.c > @@ -0,0 +1,54 @@ > +/* > + * Copyright (c) Meta Platforms, Inc. and affiliates. (http://www.meta.com) > + * > + * Permission is hereby granted, free of charge, to any person obtaining a copy > + * of this software and associated documentation files (the "Software"), to deal > + * in the Software without restriction, including without limitation the rights > + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell > + * copies of the Software, and to permit persons to whom the Software is > + * furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice shall be included in > + * all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, > + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > + * THE SOFTWARE. > + */ > + > +#include "qemu/osdep.h" > +#include "hw/boards.h" > + > +#define TYPE_FBY35 MACHINE_TYPE_NAME("fby35") > +OBJECT_DECLARE_SIMPLE_TYPE(Fby35State, FBY35); > + > +struct Fby35State { > + MachineState parent_obj; > +}; > + > +static void fby35_init(MachineState *machine) > +{ > +} > + > +static void fby35_class_init(ObjectClass *oc, void *data) > +{ > + MachineClass *mc = MACHINE_CLASS(oc); > + > + mc->desc = "Meta Platforms fby35"; > + mc->init = fby35_init; > +} > + > +static const TypeInfo fby35_types[] = { > + { > + .name = MACHINE_TYPE_NAME("fby35"), > + .parent = TYPE_MACHINE, > + .class_init = fby35_class_init, > + .instance_size = sizeof(Fby35State), > + }, > +}; > + > +DEFINE_TYPES(fby35_types); > diff --git a/hw/arm/meson.build b/hw/arm/meson.build > index 2d8381339c..92f9f6e000 100644 > --- a/hw/arm/meson.build > +++ b/hw/arm/meson.build > @@ -51,7 +51,8 @@ arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( > 'aspeed_soc.c', > 'aspeed.c', > 'aspeed_ast2600.c', > - 'aspeed_ast10x0.c')) > + 'aspeed_ast10x0.c', > + 'fby35.c')) > arm_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2.c')) > arm_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2-tz.c')) > arm_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-soc.c'))
diff --git a/MAINTAINERS b/MAINTAINERS index aaa649a50d..b43b428a30 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1067,6 +1067,7 @@ F: hw/net/ftgmac100.c F: include/hw/net/ftgmac100.h F: docs/system/arm/aspeed.rst F: tests/qtest/*aspeed* +F: hw/arm/fby35.c NRF51 M: Joel Stanley <joel@jms.id.au> diff --git a/hw/arm/fby35.c b/hw/arm/fby35.c new file mode 100644 index 0000000000..dc1ae8e62a --- /dev/null +++ b/hw/arm/fby35.c @@ -0,0 +1,54 @@ +/* + * Copyright (c) Meta Platforms, Inc. and affiliates. (http://www.meta.com) + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ + +#include "qemu/osdep.h" +#include "hw/boards.h" + +#define TYPE_FBY35 MACHINE_TYPE_NAME("fby35") +OBJECT_DECLARE_SIMPLE_TYPE(Fby35State, FBY35); + +struct Fby35State { + MachineState parent_obj; +}; + +static void fby35_init(MachineState *machine) +{ +} + +static void fby35_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + + mc->desc = "Meta Platforms fby35"; + mc->init = fby35_init; +} + +static const TypeInfo fby35_types[] = { + { + .name = MACHINE_TYPE_NAME("fby35"), + .parent = TYPE_MACHINE, + .class_init = fby35_class_init, + .instance_size = sizeof(Fby35State), + }, +}; + +DEFINE_TYPES(fby35_types); diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 2d8381339c..92f9f6e000 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -51,7 +51,8 @@ arm_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files( 'aspeed_soc.c', 'aspeed.c', 'aspeed_ast2600.c', - 'aspeed_ast10x0.c')) + 'aspeed_ast10x0.c', + 'fby35.c')) arm_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2.c')) arm_ss.add(when: 'CONFIG_MPS2', if_true: files('mps2-tz.c')) arm_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-soc.c'))
Signed-off-by: Peter Delevoryas <pdel@fb.com> --- MAINTAINERS | 1 + hw/arm/fby35.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++ hw/arm/meson.build | 3 ++- 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 hw/arm/fby35.c