summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Reinauer <reinauer@chromium.org>2012-10-10 13:12:56 +0000
committerSimon Glass <sjg@chromium.org>2012-11-28 11:40:04 -0800
commitbadcb343d7844e81be92ba9a7a02f22159591650 (patch)
tree05b7e7ffe9d8ff4f6c742581dc744b13ff3474fa
parentc953fbee540c4c5a13f747a92daa59c24a9aaacf (diff)
downloadu-boot-imx-badcb343d7844e81be92ba9a7a02f22159591650.zip
u-boot-imx-badcb343d7844e81be92ba9a7a02f22159591650.tar.gz
u-boot-imx-badcb343d7844e81be92ba9a7a02f22159591650.tar.bz2
x86: coreboot: Move non-board specific files to coreboot arch directory
coreboot.c and coreboot_pci.c don't contain board specific but only coreboot specific code. Hence move it to the coreboot directory in arch/x86/cpu (which should probably be moved out of cpu/ in another commit) Signed-off-by: Stefan Reinauer <reinauer@chromium.org> Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--arch/x86/cpu/coreboot/Makefile2
-rw-r--r--arch/x86/cpu/coreboot/coreboot.c (renamed from board/chromebook-x86/coreboot/coreboot.c)0
-rw-r--r--arch/x86/cpu/coreboot/pci.c (renamed from board/chromebook-x86/coreboot/coreboot_pci.c)0
-rw-r--r--board/chromebook-x86/coreboot/Makefile2
4 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/cpu/coreboot/Makefile b/arch/x86/cpu/coreboot/Makefile
index 13f5f8a..fbf5a00 100644
--- a/arch/x86/cpu/coreboot/Makefile
+++ b/arch/x86/cpu/coreboot/Makefile
@@ -33,10 +33,12 @@ include $(TOPDIR)/config.mk
LIB := $(obj)lib$(SOC).o
+COBJS-$(CONFIG_SYS_COREBOOT) += coreboot.o
COBJS-$(CONFIG_SYS_COREBOOT) += tables.o
COBJS-$(CONFIG_SYS_COREBOOT) += ipchecksum.o
COBJS-$(CONFIG_SYS_COREBOOT) += sdram.o
COBJS-$(CONFIG_SYS_COREBOOT) += sysinfo.o
+COBJS-$(CONFIG_PCI) += pci.o
SOBJS-$(CONFIG_SYS_COREBOOT) += coreboot_car.o
diff --git a/board/chromebook-x86/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c
index 22a643c..22a643c 100644
--- a/board/chromebook-x86/coreboot/coreboot.c
+++ b/arch/x86/cpu/coreboot/coreboot.c
diff --git a/board/chromebook-x86/coreboot/coreboot_pci.c b/arch/x86/cpu/coreboot/pci.c
index 732ca3c..732ca3c 100644
--- a/board/chromebook-x86/coreboot/coreboot_pci.c
+++ b/arch/x86/cpu/coreboot/pci.c
diff --git a/board/chromebook-x86/coreboot/Makefile b/board/chromebook-x86/coreboot/Makefile
index cfcc0df..2bddf04 100644
--- a/board/chromebook-x86/coreboot/Makefile
+++ b/board/chromebook-x86/coreboot/Makefile
@@ -32,8 +32,6 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(BOARD).o
-COBJS-y += coreboot.o
-COBJS-$(CONFIG_PCI) += coreboot_pci.o
SOBJS-y += coreboot_start16.o
SOBJS-y += coreboot_start.o