summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorBin Meng <bmeng.cn@gmail.com>2015-06-03 09:20:04 +0800
committerSimon Glass <sjg@chromium.org>2015-06-04 03:03:18 -0600
commit683b09d7837a71fb4c5dd53919c6afa4d800e60e (patch)
tree76dbdf8573491875de5b7fef84cdcc296ec9f368 /configs
parent65cdd9be3e0fe79909962bba9bedf7967d44d60b (diff)
downloadtalos-obmc-uboot-683b09d7837a71fb4c5dd53919c6afa4d800e60e.tar.gz
talos-obmc-uboot-683b09d7837a71fb4c5dd53919c6afa4d800e60e.zip
x86: qemu: Create separate i440fx and q35 device trees
Although the two qemu-x86 targets (i440fx and q35) share a lot in common, they still have something that cannot easily handled in one single device tree). Split to create two dedicated device tree files and make the i440fx be the default build target. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Acked-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'configs')
-rw-r--r--configs/qemu-x86_defconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/configs/qemu-x86_defconfig b/configs/qemu-x86_defconfig
index 4509d52f0c..0959a98283 100644
--- a/configs/qemu-x86_defconfig
+++ b/configs/qemu-x86_defconfig
@@ -1,10 +1,9 @@
CONFIG_X86=y
CONFIG_VENDOR_EMULATION=y
+CONFIG_DEFAULT_DEVICE_TREE="qemu-x86_i440fx"
CONFIG_TARGET_QEMU_X86=y
CONFIG_CMD_NET=y
CONFIG_OF_CONTROL=y
-CONFIG_OF_SEPARATE=y
-CONFIG_DEFAULT_DEVICE_TREE="qemu-x86"
CONFIG_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_111=y
OpenPOWER on IntegriCloud