| Message ID | 20220915152520.21948-2-shentey@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ppc/e500: Add support for two types of flash, cleanup | expand |
On Thu, Sep 15, 2022 at 11:25 PM Bernhard Beschow <shentey@gmail.com> wrote: > > Gives users more fine-grained control over what should be compiled into > QEMU. > > Signed-off-by: Bernhard Beschow <shentey@gmail.com> > --- > configs/devices/ppc-softmmu/default.mak | 3 ++- > hw/ppc/Kconfig | 8 ++++++++ > hw/ppc/meson.build | 6 ++---- > 3 files changed, 12 insertions(+), 5 deletions(-) > Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
On 15/9/22 17:25, Bernhard Beschow wrote: > Gives users more fine-grained control over what should be compiled into > QEMU. > > Signed-off-by: Bernhard Beschow <shentey@gmail.com> > --- > configs/devices/ppc-softmmu/default.mak | 3 ++- > hw/ppc/Kconfig | 8 ++++++++ > hw/ppc/meson.build | 6 ++---- > 3 files changed, 12 insertions(+), 5 deletions(-) > > diff --git a/configs/devices/ppc-softmmu/default.mak b/configs/devices/ppc-softmmu/default.mak > index 658a454426..a887f5438b 100644 > --- a/configs/devices/ppc-softmmu/default.mak > +++ b/configs/devices/ppc-softmmu/default.mak > @@ -1,7 +1,8 @@ > # Default configuration for ppc-softmmu > > # For embedded PPCs: > -CONFIG_E500=y > +CONFIG_E500PLAT=y > +CONFIG_MPC8544DS=y > CONFIG_PPC405=y > CONFIG_PPC440=y > CONFIG_VIRTEX=y > diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig > index 3a4418a69e..22a64745d4 100644 > --- a/hw/ppc/Kconfig > +++ b/hw/ppc/Kconfig > @@ -132,6 +132,14 @@ config E500 > select FDT_PPC > select DS1338 > > +config E500PLAT > + bool > + select E500 > + > +config MPC8544DS > + bool > + select E500 > + > config VIRTEX > bool > select PPC4XX > diff --git a/hw/ppc/meson.build b/hw/ppc/meson.build > index 62801923f3..32babc9b48 100644 > --- a/hw/ppc/meson.build > +++ b/hw/ppc/meson.build > @@ -71,12 +71,10 @@ ppc_ss.add(when: 'CONFIG_MAC_OLDWORLD', if_true: files('mac_oldworld.c')) > # NewWorld PowerMac > ppc_ss.add(when: 'CONFIG_MAC_NEWWORLD', if_true: files('mac_newworld.c')) > # e500 > +ppc_ss.add(when: 'CONFIG_E500PLAT', if_true: files('e500plat.c')) > +ppc_ss.add(when: 'CONFIG_MPC8544DS', if_true: files('mpc8544ds.c')) > ppc_ss.add(when: 'CONFIG_E500', if_true: files( > 'e500.c', > - 'mpc8544ds.c', > - 'e500plat.c' > -)) > -ppc_ss.add(when: 'CONFIG_E500', if_true: files( > 'mpc8544_guts.c', Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > 'ppce500_spin.c' > ))
diff --git a/configs/devices/ppc-softmmu/default.mak b/configs/devices/ppc-softmmu/default.mak index 658a454426..a887f5438b 100644 --- a/configs/devices/ppc-softmmu/default.mak +++ b/configs/devices/ppc-softmmu/default.mak @@ -1,7 +1,8 @@ # Default configuration for ppc-softmmu # For embedded PPCs: -CONFIG_E500=y +CONFIG_E500PLAT=y +CONFIG_MPC8544DS=y CONFIG_PPC405=y CONFIG_PPC440=y CONFIG_VIRTEX=y diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 3a4418a69e..22a64745d4 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -132,6 +132,14 @@ config E500 select FDT_PPC select DS1338 +config E500PLAT + bool + select E500 + +config MPC8544DS + bool + select E500 + config VIRTEX bool select PPC4XX diff --git a/hw/ppc/meson.build b/hw/ppc/meson.build index 62801923f3..32babc9b48 100644 --- a/hw/ppc/meson.build +++ b/hw/ppc/meson.build @@ -71,12 +71,10 @@ ppc_ss.add(when: 'CONFIG_MAC_OLDWORLD', if_true: files('mac_oldworld.c')) # NewWorld PowerMac ppc_ss.add(when: 'CONFIG_MAC_NEWWORLD', if_true: files('mac_newworld.c')) # e500 +ppc_ss.add(when: 'CONFIG_E500PLAT', if_true: files('e500plat.c')) +ppc_ss.add(when: 'CONFIG_MPC8544DS', if_true: files('mpc8544ds.c')) ppc_ss.add(when: 'CONFIG_E500', if_true: files( 'e500.c', - 'mpc8544ds.c', - 'e500plat.c' -)) -ppc_ss.add(when: 'CONFIG_E500', if_true: files( 'mpc8544_guts.c', 'ppce500_spin.c' ))
Gives users more fine-grained control over what should be compiled into QEMU. Signed-off-by: Bernhard Beschow <shentey@gmail.com> --- configs/devices/ppc-softmmu/default.mak | 3 ++- hw/ppc/Kconfig | 8 ++++++++ hw/ppc/meson.build | 6 ++---- 3 files changed, 12 insertions(+), 5 deletions(-)