summaryrefslogtreecommitdiffstats
path: root/board
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2016-01-14 21:51:32 -0500
committerTom Rini <trini@konsulko.com>2016-01-14 21:51:32 -0500
commit4edde96111aefac63d6aaca6ba87a90d149e973e (patch)
tree83996996fc15554644c114e4f4d534d78cef15fd /board
parenta737028e80603f49a4757adec10b5842d0689dbb (diff)
parent5c2ed61ce235fd835a3f594bc983dfc20959568c (diff)
downloadtalos-obmc-uboot-4edde96111aefac63d6aaca6ba87a90d149e973e.tar.gz
talos-obmc-uboot-4edde96111aefac63d6aaca6ba87a90d149e973e.zip
Merge branch 'master' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'board')
-rw-r--r--board/google/chromebook_link/Kconfig1
-rw-r--r--board/google/chromebox_panther/Kconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/board/google/chromebook_link/Kconfig b/board/google/chromebook_link/Kconfig
index 6b139392b5..fa12f338de 100644
--- a/board/google/chromebook_link/Kconfig
+++ b/board/google/chromebook_link/Kconfig
@@ -19,6 +19,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
select X86_RESET_VECTOR
select NORTHBRIDGE_INTEL_IVYBRIDGE
+ select HAVE_INTEL_ME
select BOARD_ROMSIZE_KB_8192
config PCIE_ECAM_BASE
diff --git a/board/google/chromebox_panther/Kconfig b/board/google/chromebox_panther/Kconfig
index ae96d23d03..2af3aa9e74 100644
--- a/board/google/chromebox_panther/Kconfig
+++ b/board/google/chromebox_panther/Kconfig
@@ -20,6 +20,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
select X86_RESET_VECTOR
select NORTHBRIDGE_INTEL_IVYBRIDGE
+ select HAVE_INTEL_ME
select BOARD_ROMSIZE_KB_8192
config SYS_CAR_ADDR
OpenPOWER on IntegriCloud