From 187f1bcb9ce8e3cd3f634dd5405f9e5ed02b38ce Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Fri, 24 May 2013 16:26:57 +0100 Subject: ppc: Remove CONFIG_FDT conditionals Now that we know we're compiling with libfdt we can remove the CONFIG_FDT conditionals. Signed-off-by: Peter Maydell Reviewed-by: Edgar E. Iglesias Reviewed-by: Peter Crosthwaite Tested-by: Edgar E. Iglesias Message-id: 1369409217-7553-5-git-send-email-peter.maydell@linaro.org --- default-configs/ppc-softmmu.mak | 2 +- default-configs/ppc64-softmmu.mak | 4 ++-- default-configs/ppcemb-softmmu.mak | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'default-configs') diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index cc3587f721..bcaa52fb10 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -42,6 +42,6 @@ CONFIG_I8259=y CONFIG_XILINX=y CONFIG_XILINX_ETHLITE=y CONFIG_OPENPIC=y -CONFIG_E500=$(CONFIG_FDT) +CONFIG_E500=y # For PReP CONFIG_MC146818RTC=y diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index 884ea8a1cd..8b7874ea6a 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -42,8 +42,8 @@ CONFIG_I8259=y CONFIG_XILINX=y CONFIG_XILINX_ETHLITE=y CONFIG_OPENPIC=y -CONFIG_PSERIES=$(CONFIG_FDT) -CONFIG_E500=$(CONFIG_FDT) +CONFIG_PSERIES=y +CONFIG_E500=y # For pSeries CONFIG_PCI_HOTPLUG=y # For PReP diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak index be93e03ce2..61920ffe63 100644 --- a/default-configs/ppcemb-softmmu.mak +++ b/default-configs/ppcemb-softmmu.mak @@ -37,6 +37,6 @@ CONFIG_I8259=y CONFIG_XILINX=y CONFIG_XILINX_ETHLITE=y CONFIG_OPENPIC=y -CONFIG_E500=$(CONFIG_FDT) +CONFIG_E500=y # For PReP CONFIG_MC146818RTC=y -- cgit v1.2.1