From: Tom Rini <trini@ti.com>
Date: Mon, 24 Nov 2014 17:00:00 +0000 (-0500)
Subject: Merge git://git.denx.de/u-boot-x86
X-Git-Tag: v2025.01-rc5-pxa1908~14237
X-Git-Url: http://git.dujemihanovic.xyz/img/%7B%7B%20%24image.RelPermalink%20%7D%7D?a=commitdiff_plain;h=746667f1e56bf08d03e66a178df3c4f4f6c806e1;p=u-boot.git

Merge git://git.denx.de/u-boot-x86

Conflicts:
	arch/x86/cpu/Makefile

Signed-off-by: Tom Rini <trini@ti.com>
---

746667f1e56bf08d03e66a178df3c4f4f6c806e1
diff --cc arch/x86/cpu/Makefile
index 8dd7b06c5d,97f36d5d78..2b9e9b9cf0
--- a/arch/x86/cpu/Makefile
+++ b/arch/x86/cpu/Makefile
@@@ -11,5 -11,4 +11,6 @@@
  extra-y	= start.o
  obj-$(CONFIG_X86_RESET_VECTOR) += resetvec.o start16.o
  obj-y	+= interrupts.o cpu.o call64.o
 +
 +obj-$(CONFIG_SYS_COREBOOT) += coreboot/
+ obj-$(CONFIG_PCI) += pci.o