Merge branch 'master' of git://git.denx.de/u-boot-x86

2016-01-14 21:51:32 -05:00
parent a737028e80 5c2ed61ce2
commit 4edde96111
31 changed files with 3143 additions and 105 deletions
--- 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
--- 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