From: BALATON Zoltan <[email protected]> Now that we also emulate pegasos1 it is not only about pegasos2 so rename to a more generic name encompassing both.
Signed-off-by: BALATON Zoltan <[email protected]> Reviewed-by: Philippe Mathieu-Daudé <[email protected]> Signed-off-by: Harsh Prateek Bora <[email protected]> Link: https://lore.kernel.org/r/275cd2d5074b76b4a504a01f658e85ed7994ea3e.1761346145.git.bala...@eik.bme.hu Message-ID: <275cd2d5074b76b4a504a01f658e85ed7994ea3e.1761346145.git.bala...@eik.bme.hu> --- MAINTAINERS | 4 ++-- configs/devices/ppc-softmmu/default.mak | 7 +++---- hw/ppc/{pegasos2.c => pegasos.c} | 0 hw/ppc/Kconfig | 2 +- hw/ppc/meson.build | 4 ++-- 5 files changed, 8 insertions(+), 9 deletions(-) rename hw/ppc/{pegasos2.c => pegasos.c} (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 0a620ba87c..8063eefa2a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1648,11 +1648,11 @@ F: roms/u-boot-sam460ex F: docs/system/ppc/amigang.rst F: tests/functional/ppc/test_sam460ex.py -pegasos2 +pegasos M: BALATON Zoltan <[email protected]> L: [email protected] S: Maintained -F: hw/ppc/pegasos2.c +F: hw/ppc/pegasos.c F: hw/pci-host/mv64361.c F: hw/pci-host/mv643xx.h F: include/hw/pci-host/mv64361.h diff --git a/configs/devices/ppc-softmmu/default.mak b/configs/devices/ppc-softmmu/default.mak index 460d15e676..180ae31e2d 100644 --- a/configs/devices/ppc-softmmu/default.mak +++ b/configs/devices/ppc-softmmu/default.mak @@ -13,15 +13,14 @@ # CONFIG_PPC440=n # CONFIG_VIRTEX=n -# For Sam460ex +# AmigaNG +# CONFIG_AMIGAONE=n +# CONFIG_PEGASOS=n # CONFIG_SAM460EX=n # For Macs # CONFIG_MAC_OLDWORLD=n # CONFIG_MAC_NEWWORLD=n -# CONFIG_AMIGAONE=n -# CONFIG_PEGASOS2=n - # For PReP # CONFIG_PREP=n diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos.c similarity index 100% rename from hw/ppc/pegasos2.c rename to hw/ppc/pegasos.c diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 7091d72fd8..347dcce690 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -92,7 +92,7 @@ config AMIGAONE select VT82C686 select SMBUS_EEPROM -config PEGASOS2 +config PEGASOS bool default y depends on PPC diff --git a/hw/ppc/meson.build b/hw/ppc/meson.build index 6b7c1f4f49..f7dac87a2a 100644 --- a/hw/ppc/meson.build +++ b/hw/ppc/meson.build @@ -87,8 +87,8 @@ ppc_ss.add(when: 'CONFIG_E500', if_true: files( ppc_ss.add(when: 'CONFIG_VIRTEX', if_true: files('virtex_ml507.c')) # AmigaOne ppc_ss.add(when: 'CONFIG_AMIGAONE', if_true: files('amigaone.c')) -# Pegasos2 -ppc_ss.add(when: 'CONFIG_PEGASOS2', if_true: files('pegasos2.c')) +# Pegasos +ppc_ss.add(when: 'CONFIG_PEGASOS', if_true: files('pegasos.c')) ppc_ss.add(when: 'CONFIG_VOF', if_true: files('vof.c')) ppc_ss.add(when: ['CONFIG_VOF', 'CONFIG_PSERIES'], if_true: files('spapr_vof.c')) -- 2.43.5
