On 2019-01-15 15:10, Yang Zhong wrote:
> From: Ákos Kovács <akoskov...@gmx.com>
>
> CONFIG_PPC405, CONFIG_PPC440, CONFIG_MAC_OLDWORLD, CONFIG_MAX_NEWWORLD
> and CONFIG_VIRTEX configuration options created for
> default-configs/ppc*-softmmu.mak.
>
> Signed-off-by: Ákos Kovács <akoskov...@gmx.com>
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
> Signed-off-by: Yang Zhong <yang.zh...@intel.com>
> ---
> default-configs/ppc-softmmu.mak | 7 ++++++-
> hw/ppc/Makefile.objs | 12 ++++++------
> 2 files changed, 12 insertions(+), 7 deletions(-)
>
> diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
> index 23d871fb3e..96088f47ca 100644
> --- a/default-configs/ppc-softmmu.mak
> +++ b/default-configs/ppc-softmmu.mak
> @@ -34,7 +34,6 @@ CONFIG_M41T80=y
> CONFIG_VGA_CIRRUS=y
>
> # For Macs
> -CONFIG_MAC=y
> CONFIG_ESCC=y
> CONFIG_MACIO=y
> CONFIG_MACIO_GPIO=y
> @@ -69,3 +68,9 @@ CONFIG_PC87312=y
> CONFIG_PCSPK=y
> CONFIG_IDE_ISA=y
> CONFIG_CS4231A=y
> +
> +CONFIG_PPC405=y
> +CONFIG_PPC440=y
> +CONFIG_MAC_OLDWORLD=y
> +CONFIG_MAC_NEWWORLD=y
> +CONFIG_VIRTEX=
Could you please sort the new config switches into the right sections
here? e.g. CONFIG_MAC_NEW/OLDWORLD in the "# For Macs" section, and the
others into the "# For embedded PPC" section?
Thanks,
Thomas
> diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
> index 4e0c1c0941..2ce7973219 100644
> --- a/hw/ppc/Makefile.objs
> +++ b/hw/ppc/Makefile.objs
> @@ -13,20 +13,20 @@ obj-y += spapr_pci_vfio.o
> endif
> obj-$(CONFIG_PSERIES) += spapr_rtas_ddw.o
> # PowerPC 4xx boards
> -obj-y += ppc4xx_devs.o ppc405_uc.o
> -obj-$(CONFIG_PPC4XX) += ppc4xx_pci.o ppc405_boards.o
> -obj-$(CONFIG_PPC4XX) += ppc440_bamboo.o ppc440_pcix.o ppc440_uc.o
> +obj-$(CONFIG_PPC405) += ppc405_boards.o ppc405_uc.o
> +obj-$(CONFIG_PPC440) += ppc440_bamboo.o ppc440_pcix.o ppc440_uc.o
> +obj-$(CONFIG_PPC4XX) += ppc4xx_pci.o ppc4xx_devs.o
> obj-$(CONFIG_SAM460EX) += sam460ex.o
> # PReP
> obj-$(CONFIG_PREP) += prep.o
> obj-$(CONFIG_PREP) += prep_systemio.o
> obj-${CONFIG_RS6000_MC} += rs6000_mc.o
> # OldWorld PowerMac
> -obj-$(CONFIG_MAC) += mac_oldworld.o
> +obj-$(CONFIG_MAC_OLDWORLD) += mac_oldworld.o
> # NewWorld PowerMac
> -obj-$(CONFIG_MAC) += mac_newworld.o
> +obj-$(CONFIG_MAC_NEWWORLD) += mac_newworld.o
> # e500
> obj-$(CONFIG_E500) += e500.o mpc8544ds.o e500plat.o
> obj-$(CONFIG_E500) += mpc8544_guts.o ppce500_spin.o
> # PowerPC 440 Xilinx ML507 reference board.
> -obj-$(CONFIG_XILINX) += virtex_ml507.o
> +obj-$(CONFIG_VIRTEX) += virtex_ml507.o
>
