summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2015-01-13 13:39:25 -0500
committerTom Rini <trini@ti.com>2015-01-13 13:39:25 -0500
commit5f88ed5cde04612e5b4520327b82d81a3f5493a0 (patch)
treeae465a7b43e4a01fa4ec774f0199e86743c8d46a /configs
parent95f5c8f2269fc144fba5a21c0e9edf5311007484 (diff)
parent657e384af630463e3c8c4ffbacd16c5e46aeb0e0 (diff)
downloadu-boot-imx-5f88ed5cde04612e5b4520327b82d81a3f5493a0.zip
u-boot-imx-5f88ed5cde04612e5b4520327b82d81a3f5493a0.tar.gz
u-boot-imx-5f88ed5cde04612e5b4520327b82d81a3f5493a0.tar.bz2
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'configs')
-rw-r--r--configs/chromebook_link_defconfig1
-rw-r--r--configs/coreboot-x86_defconfig1
2 files changed, 1 insertions, 1 deletions
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index b83803e..e956835 100644
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -6,5 +6,6 @@ CONFIG_OF_SEPARATE=y
CONFIG_DEFAULT_DEVICE_TREE="chromebook_link"
CONFIG_HAVE_MRC=y
CONFIG_SMM_TSEG_SIZE=0x800000
+CONFIG_VIDEO_X86=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
diff --git a/configs/coreboot-x86_defconfig b/configs/coreboot-x86_defconfig
index 6249db7..3cc034a 100644
--- a/configs/coreboot-x86_defconfig
+++ b/configs/coreboot-x86_defconfig
@@ -2,4 +2,3 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_TEXT_BASE=0x01110000"
CONFIG_X86=y
CONFIG_TARGET_COREBOOT=y
CONFIG_OF_CONTROL=y
-CONFIG_DEFAULT_DEVICE_TREE="link"