Commit e4c8b28c authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

ppc: express FDT dependency of pSeries and e500 boards via default-configs/ 



Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 320ba5fe

configure

+0 −3
Original line number Diff line number Diff line
@@ -4144,9 +4144,6 @@ case "$target_arch2" in 
  i386|x86_64)

    echo "CONFIG_HAVE_GET_MEMORY_MAPPING=y" >> $config_target_mak

esac

if test "$target_arch2" = "ppc64" -a "$fdt" = "yes"; then

  echo "CONFIG_PSERIES=y" >> $config_target_mak

fi

if test "$target_bigendian" = "yes" ; then

  echo "TARGET_WORDS_BIGENDIAN=y" >> $config_target_mak

fi

default-configs/ppc-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -40,3 +40,4 @@ CONFIG_PFLASH_CFI02=y 
CONFIG_PTIMER=y

CONFIG_I8259=y

CONFIG_XILINX=y

CONFIG_E500=$(CONFIG_FDT)

default-configs/ppc64-softmmu.mak

+2 −0
Original line number Diff line number Diff line
@@ -40,3 +40,5 @@ CONFIG_PFLASH_CFI02=y 
CONFIG_PTIMER=y

CONFIG_I8259=y

CONFIG_XILINX=y

CONFIG_PSERIES=$(CONFIG_FDT)

CONFIG_E500=$(CONFIG_FDT)

default-configs/ppcemb-softmmu.mak

+1 −0
Original line number Diff line number Diff line
@@ -35,3 +35,4 @@ CONFIG_PFLASH_CFI02=y 
CONFIG_PTIMER=y

CONFIG_I8259=y

CONFIG_XILINX=y

CONFIG_E500=$(CONFIG_FDT)

hw/ppc/Makefile.objs

+2 −2
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ obj-$(CONFIG_PSERIES) += spapr_events.o spapr_nvram.o 
obj-y += ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o

obj-y += ppc440_bamboo.o

# PowerPC E500 boards

obj-$(CONFIG_FDT) += mpc8544_guts.o ppce500_spin.o

obj-$(CONFIG_E500) += mpc8544_guts.o ppce500_spin.o

# PowerPC 440 Xilinx ML507 reference board.

obj-y += virtex_ml507.o

# PowerPC OpenPIC
@@ -29,4 +29,4 @@ obj-y += mac_oldworld.o 
# NewWorld PowerMac

obj-y += mac_newworld.o

# e500

obj-$(CONFIG_FDT) += e500.o mpc8544ds.o e500plat.o
 
obj-$(CONFIG_E500) += e500.o mpc8544ds.o e500plat.o