summaryrefslogtreecommitdiff
path: root/src/soc/intel
diff options
context:
space:
mode:
authorAngel Pons <th3fanbus@gmail.com>2020-10-26 00:27:09 +0100
committerMichael Niewöhner <foss@mniewoehner.de>2020-11-13 13:17:49 +0000
commit3bd017356a7766c4884e55a28ca481c8a9110ceb (patch)
tree3d9ebcf9af8d5cbf5c3c63b25ed3bc2800baf573 /src/soc/intel
parenta0426267e330c60aa74528a06a0e130efe2ad32f (diff)
soc/intel/broadwell: Relocate CPU files
Change-Id: Ib2ddce78db21db9c8deac632a77ecd71eb9887c2 Signed-off-by: Angel Pons <th3fanbus@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/46794 Reviewed-by: Michael Niewöhner <foss@mniewoehner.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/intel')
-rw-r--r--src/soc/intel/broadwell/Makefile.inc24
-rw-r--r--src/soc/intel/broadwell/cpu/Makefile.inc29
-rw-r--r--src/soc/intel/broadwell/cpu/bootblock.c (renamed from src/soc/intel/broadwell/bootblock/cpu.c)0
-rw-r--r--src/soc/intel/broadwell/cpu/cpu.c (renamed from src/soc/intel/broadwell/cpu.c)0
-rw-r--r--src/soc/intel/broadwell/cpu/romstage.c (renamed from src/soc/intel/broadwell/romstage/cpu.c)0
-rw-r--r--src/soc/intel/broadwell/cpu/smmrelocate.c (renamed from src/soc/intel/broadwell/smmrelocate.c)0
-rw-r--r--src/soc/intel/broadwell/cpu/tsc_freq.c (renamed from src/soc/intel/broadwell/tsc_freq.c)0
-rw-r--r--src/soc/intel/broadwell/romstage/Makefile.inc2
8 files changed, 30 insertions, 25 deletions
diff --git a/src/soc/intel/broadwell/Makefile.inc b/src/soc/intel/broadwell/Makefile.inc
index ce1dd9cbf6..dc6bd93c34 100644
--- a/src/soc/intel/broadwell/Makefile.inc
+++ b/src/soc/intel/broadwell/Makefile.inc
@@ -1,24 +1,13 @@
ifeq ($(CONFIG_SOC_INTEL_BROADWELL),y)
subdirs-y += romstage
-subdirs-y += ../../../cpu/x86/lapic
-subdirs-y += ../../../cpu/x86/mtrr
-subdirs-y += ../../../cpu/x86/smm
-subdirs-y += ../../../cpu/x86/tsc
-subdirs-y += ../../../cpu/intel/microcode
-subdirs-y += ../../../cpu/intel/turbo
-subdirs-y += ../../../cpu/intel/common
+subdirs-y += cpu
subdirs-y += pch
-bootblock-y += bootblock/cpu.c
bootblock-y += bootblock/systemagent.c
-bootblock-y += ../../../cpu/intel/car/bootblock.c
-bootblock-y += ../../../cpu/intel/car/non-evict/cache_as_ram.S
-bootblock-y += ../../../cpu/x86/early_reset.S
ramstage-y += acpi.c
-ramstage-y += cpu.c
ramstage-y += finalize.c
ramstage-y += gma.c
ramstage-y += memmap.c
@@ -29,18 +18,7 @@ ramstage-y += pei_data.c
romstage-y += pei_data.c
ramstage-y += ramstage.c
ramstage-$(CONFIG_HAVE_REFCODE_BLOB) += refcode.c
-ramstage-y += smmrelocate.c
ramstage-y += systemagent.c
-bootblock-y += tsc_freq.c
-ramstage-y += tsc_freq.c
-romstage-y += tsc_freq.c
-smm-y += tsc_freq.c
-postcar-y += tsc_freq.c
-verstage-y += tsc_freq.c
-
-postcar-y += ../../../cpu/intel/car/non-evict/exit_car.S
-
-cpu_microcode_bins += 3rdparty/blobs/soc/intel/broadwell/microcode.bin
CPPFLAGS_common += -Isrc/soc/intel/broadwell/include
diff --git a/src/soc/intel/broadwell/cpu/Makefile.inc b/src/soc/intel/broadwell/cpu/Makefile.inc
new file mode 100644
index 0000000000..e9f46376af
--- /dev/null
+++ b/src/soc/intel/broadwell/cpu/Makefile.inc
@@ -0,0 +1,29 @@
+subdirs-y += ../../../../cpu/x86/lapic
+subdirs-y += ../../../../cpu/x86/mtrr
+subdirs-y += ../../../../cpu/x86/smm
+subdirs-y += ../../../../cpu/x86/tsc
+subdirs-y += ../../../../cpu/intel/microcode
+subdirs-y += ../../../../cpu/intel/turbo
+subdirs-y += ../../../../cpu/intel/common
+
+bootblock-y += bootblock.c
+bootblock-y += ../../../../cpu/intel/car/bootblock.c
+bootblock-y += ../../../../cpu/intel/car/non-evict/cache_as_ram.S
+bootblock-y += ../../../../cpu/x86/early_reset.S
+
+romstage-y += romstage.c
+romstage-y += ../../../../cpu/intel/car/romstage.c
+
+postcar-y += ../../../../cpu/intel/car/non-evict/exit_car.S
+
+ramstage-y += cpu.c
+ramstage-y += smmrelocate.c
+
+bootblock-y += tsc_freq.c
+ramstage-y += tsc_freq.c
+romstage-y += tsc_freq.c
+smm-y += tsc_freq.c
+postcar-y += tsc_freq.c
+verstage-y += tsc_freq.c
+
+cpu_microcode_bins += 3rdparty/blobs/soc/intel/broadwell/microcode.bin
diff --git a/src/soc/intel/broadwell/bootblock/cpu.c b/src/soc/intel/broadwell/cpu/bootblock.c
index d6883c6436..d6883c6436 100644
--- a/src/soc/intel/broadwell/bootblock/cpu.c
+++ b/src/soc/intel/broadwell/cpu/bootblock.c
diff --git a/src/soc/intel/broadwell/cpu.c b/src/soc/intel/broadwell/cpu/cpu.c
index 72efa3dc81..72efa3dc81 100644
--- a/src/soc/intel/broadwell/cpu.c
+++ b/src/soc/intel/broadwell/cpu/cpu.c
diff --git a/src/soc/intel/broadwell/romstage/cpu.c b/src/soc/intel/broadwell/cpu/romstage.c
index c9f70a85d1..c9f70a85d1 100644
--- a/src/soc/intel/broadwell/romstage/cpu.c
+++ b/src/soc/intel/broadwell/cpu/romstage.c
diff --git a/src/soc/intel/broadwell/smmrelocate.c b/src/soc/intel/broadwell/cpu/smmrelocate.c
index 3d4162abd0..3d4162abd0 100644
--- a/src/soc/intel/broadwell/smmrelocate.c
+++ b/src/soc/intel/broadwell/cpu/smmrelocate.c
diff --git a/src/soc/intel/broadwell/tsc_freq.c b/src/soc/intel/broadwell/cpu/tsc_freq.c
index 4a8a34349f..4a8a34349f 100644
--- a/src/soc/intel/broadwell/tsc_freq.c
+++ b/src/soc/intel/broadwell/cpu/tsc_freq.c
diff --git a/src/soc/intel/broadwell/romstage/Makefile.inc b/src/soc/intel/broadwell/romstage/Makefile.inc
index b77e7a579d..65cb9adee5 100644
--- a/src/soc/intel/broadwell/romstage/Makefile.inc
+++ b/src/soc/intel/broadwell/romstage/Makefile.inc
@@ -1,5 +1,3 @@
-romstage-y += ../../../../cpu/intel/car/romstage.c
-romstage-y += cpu.c
romstage-y += raminit.c
romstage-y += report_platform.c
romstage-y += romstage.c