aboutsummaryrefslogtreecommitdiff
path: root/default-configs
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2013-05-24 16:26:57 +0100
committerPeter Maydell <peter.maydell@linaro.org>2013-06-14 15:34:19 +0100
commit187f1bcb9ce8e3cd3f634dd5405f9e5ed02b38ce (patch)
tree21e316996f3471de7867a15173ca88f82b9a0c7f /default-configs
parent564720219a0863625e9989fd258ccc57a616550f (diff)
downloadqemu-arm-187f1bcb9ce8e3cd3f634dd5405f9e5ed02b38ce.tar.gz
ppc: Remove CONFIG_FDT conditionalsconfigury.nextconfigury.for-upstream
Now that we know we're compiling with libfdt we can remove the CONFIG_FDT conditionals. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Edgar E. Iglesias <edgar.iglesias@gmail.com> Reviewed-by: Peter Crosthwaite <peter.crosthwaite@xilinx.com> Tested-by: Edgar E. Iglesias <edgar.iglesias@gmail.com> Message-id: 1369409217-7553-5-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'default-configs')
-rw-r--r--default-configs/ppc-softmmu.mak2
-rw-r--r--default-configs/ppc64-softmmu.mak4
-rw-r--r--default-configs/ppcemb-softmmu.mak2
3 files changed, 4 insertions, 4 deletions
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