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>

diff --git a/arch/x86/cpu/coreboot/Makefile b/arch/x86/cpu/coreboot/Makefile
index 13f5f8a2f05fe41cf2475591c25a723b3266aa90..fbf5a0038ce352250b6380ed787bf393d596545b 100644 (file)
--- 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
 
 
 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_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
 
 
 SOBJS-$(CONFIG_SYS_COREBOOT) += coreboot_car.o
 

diff --git a/board/chromebook-x86/coreboot/coreboot.c b/arch/x86/cpu/coreboot/coreboot.c
similarity index 100%
rename from board/chromebook-x86/coreboot/coreboot.c
rename to arch/x86/cpu/coreboot/coreboot.c

diff --git a/board/chromebook-x86/coreboot/coreboot_pci.c b/arch/x86/cpu/coreboot/pci.c
similarity index 100%
rename from board/chromebook-x86/coreboot/coreboot_pci.c
rename to arch/x86/cpu/coreboot/pci.c

diff --git a/board/chromebook-x86/coreboot/Makefile b/board/chromebook-x86/coreboot/Makefile
index cfcc0dfbe51ef77d901d07f1d73c9d47fc7ffb5b..2bddf04b664212954cdccd012dc3a76cf5d6b13a 100644 (file)
--- 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
 
 
 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
 
 SOBJS-y        += coreboot_start16.o
 SOBJS-y        += coreboot_start.o