summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2015-01-26 17:44:49 -0500
committerTom Rini <trini@ti.com>2015-01-26 17:44:49 -0500
commitab92da9f47d51d363c7de42e2a7bd807e2c1bd54 (patch)
treedfabc29929e39a1ecc47edf5a4cf839ead062acd /configs
parentaed03faa064cca56847571b13cbd4c849c6116aa (diff)
parente43ade3749ff10bc313f33bf23705465e4163896 (diff)
downloadblackbird-obmc-uboot-ab92da9f47d51d363c7de42e2a7bd807e2c1bd54.tar.gz
blackbird-obmc-uboot-ab92da9f47d51d363c7de42e2a7bd807e2c1bd54.zip
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'configs')
-rw-r--r--configs/chromebook_link_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/chromebook_link_defconfig b/configs/chromebook_link_defconfig
index e956835dc6..2f0c714e59 100644
--- a/configs/chromebook_link_defconfig
+++ b/configs/chromebook_link_defconfig
@@ -6,6 +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_VIDEO_VESA=y
CONFIG_FRAMEBUFFER_SET_VESA_MODE=y
CONFIG_FRAMEBUFFER_VESA_MODE_11A=y
OpenPOWER on IntegriCloud