27 files changed, 40 insertions, 37 deletions
diff --git a/src/soc/intel/broadwell/Makefile.inc b/src/soc/intel/broadwell/Makefile.inc
index e24b949fb5..75ef33fa02 100644
--- a/src/soc/intel/broadwell/Makefile.inc
+++ b/src/soc/intel/broadwell/Makefile.inc
@@ -9,52 +9,28 @@ subdirs-y += ../../../cpu/intel/microcode
 subdirs-y += ../../../cpu/intel/turbo
 subdirs-y += ../../../cpu/intel/common
 
+subdirs-y += pch
+
 bootblock-y += bootblock/cpu.c
-bootblock-y += bootblock/pch.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 += adsp.c
 ramstage-y += cpu.c
 ramstage-y += cpu_info.c
 smm-y += cpu_info.c
-ramstage-$(CONFIG_ELOG) += elog.c
 ramstage-y += finalize.c
-ramstage-y += gpio.c
-romstage-y += gpio.c
-smm-y      += gpio.c
-ramstage-y += hda.c
 ramstage-y += gma.c
-ramstage-y += iobp.c
-romstage-y += iobp.c
-ramstage-y += fadt.c
-ramstage-y += lpc.c
-ramstage-y += me.c
-ramstage-y += me_status.c
-romstage-y += me_status.c
 ramstage-y += memmap.c
 romstage-y += memmap.c
 postcar-y += memmap.c
 ramstage-y += minihd.c
-ramstage-y += pch.c
-romstage-y += pch.c
-ramstage-y += pcie.c
 ramstage-y += pei_data.c
 romstage-y += pei_data.c
-ramstage-y += pmutil.c
-romstage-y += pmutil.c
-smm-y      += pmutil.c
-verstage-y += pmutil.c
 ramstage-y += ramstage.c
 ramstage-$(CONFIG_HAVE_REFCODE_BLOB) += refcode.c
-ramstage-y += sata.c
-ramstage-y += serialio.c
-ramstage-y += smbus.c
-ramstage-y += smi.c
-smm-y      += smihandler.c
 ramstage-y += smmrelocate.c
 ramstage-y += systemagent.c
 bootblock-y += tsc_freq.c
@@ -63,17 +39,9 @@ romstage-y += tsc_freq.c
 smm-y      += tsc_freq.c
 postcar-y  += tsc_freq.c
 verstage-y += tsc_freq.c
-bootblock-y += usb_debug.c
-romstage-y += usb_debug.c
-ramstage-y += usb_debug.c
-ramstage-y += ehci.c
-ramstage-y += xhci.c
-smm-y      += xhci.c
 
 postcar-y += ../../../cpu/intel/car/non-evict/exit_car.S
 
-ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/hda_verb.c
-
 cpu_microcode_bins += 3rdparty/blobs/soc/intel/broadwell/microcode.bin
 
 CPPFLAGS_common += -Isrc/soc/intel/broadwell/include
diff --git a/src/soc/intel/broadwell/pch/Makefile.inc b/src/soc/intel/broadwell/pch/Makefile.inc
new file mode 100644
index 0000000000..7e5c65aa76
--- /dev/null
+++ b/src/soc/intel/broadwell/pch/Makefile.inc
@@ -0,0 +1,38 @@
+bootblock-y += bootblock.c
+
+ramstage-y += adsp.c
+romstage-y += early_pch.c
+ramstage-$(CONFIG_ELOG) += elog.c
+ramstage-y += gpio.c
+romstage-y += gpio.c
+smm-y      += gpio.c
+ramstage-y += hda.c
+ramstage-y += iobp.c
+romstage-y += iobp.c
+ramstage-y += fadt.c
+ramstage-y += lpc.c
+ramstage-y += me.c
+ramstage-y += me_status.c
+romstage-y += me_status.c
+ramstage-y += pch.c
+romstage-y += pch.c
+ramstage-y += pcie.c
+ramstage-y += pmutil.c
+romstage-y += pmutil.c
+smm-y      += pmutil.c
+verstage-y += pmutil.c
+romstage-y += power_state.c
+ramstage-y += sata.c
+ramstage-y += serialio.c
+ramstage-y += smbus.c
+ramstage-y += smi.c
+smm-y      += smihandler.c
+romstage-$(CONFIG_DRIVERS_UART_8250MEM) += uart.c
+bootblock-y += usb_debug.c
+romstage-y += usb_debug.c
+ramstage-y += usb_debug.c
+ramstage-y += ehci.c
+ramstage-y += xhci.c
+smm-y      += xhci.c
+
+ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/hda_verb.c
diff --git a/src/soc/intel/broadwell/adsp.c b/src/soc/intel/broadwell/pch/adsp.c
index 06dd38bd8a..06dd38bd8a 100644
--- a/src/soc/intel/broadwell/adsp.c
+++ b/src/soc/intel/broadwell/pch/adsp.c
diff --git a/src/soc/intel/broadwell/bootblock/pch.c b/src/soc/intel/broadwell/pch/bootblock.c
index 7f6d0d52d9..7f6d0d52d9 100644
--- a/src/soc/intel/broadwell/bootblock/pch.c
+++ b/src/soc/intel/broadwell/pch/bootblock.c
diff --git a/src/soc/intel/broadwell/romstage/pch.c b/src/soc/intel/broadwell/pch/early_pch.c
index 149dda1ca0..149dda1ca0 100644
--- a/src/soc/intel/broadwell/romstage/pch.c
+++ b/src/soc/intel/broadwell/pch/early_pch.c
diff --git a/src/soc/intel/broadwell/ehci.c b/src/soc/intel/broadwell/pch/ehci.c
index 5b977dd3c6..5b977dd3c6 100644
--- a/src/soc/intel/broadwell/ehci.c
+++ b/src/soc/intel/broadwell/pch/ehci.c
diff --git a/src/soc/intel/broadwell/elog.c b/src/soc/intel/broadwell/pch/elog.c
index 9271e27872..9271e27872 100644
--- a/src/soc/intel/broadwell/elog.c
+++ b/src/soc/intel/broadwell/pch/elog.c
diff --git a/src/soc/intel/broadwell/fadt.c b/src/soc/intel/broadwell/pch/fadt.c
index 8fbd0c45ad..8fbd0c45ad 100644
--- a/src/soc/intel/broadwell/fadt.c
+++ b/src/soc/intel/broadwell/pch/fadt.c
diff --git a/src/soc/intel/broadwell/gpio.c b/src/soc/intel/broadwell/pch/gpio.c
index ff1f019ce0..ff1f019ce0 100644
--- a/src/soc/intel/broadwell/gpio.c
+++ b/src/soc/intel/broadwell/pch/gpio.c
diff --git a/src/soc/intel/broadwell/hda.c b/src/soc/intel/broadwell/pch/hda.c
index 04390d1342..04390d1342 100644
--- a/src/soc/intel/broadwell/hda.c
+++ b/src/soc/intel/broadwell/pch/hda.c
diff --git a/src/soc/intel/broadwell/iobp.c b/src/soc/intel/broadwell/pch/iobp.c
index deb4156198..deb4156198 100644
--- a/src/soc/intel/broadwell/iobp.c
+++ b/src/soc/intel/broadwell/pch/iobp.c
diff --git a/src/soc/intel/broadwell/lpc.c b/src/soc/intel/broadwell/pch/lpc.c
index 2111913a0e..2111913a0e 100644
--- a/src/soc/intel/broadwell/lpc.c
+++ b/src/soc/intel/broadwell/pch/lpc.c
diff --git a/src/soc/intel/broadwell/me.c b/src/soc/intel/broadwell/pch/me.c
index 40a81d8810..40a81d8810 100644
--- a/src/soc/intel/broadwell/me.c
+++ b/src/soc/intel/broadwell/pch/me.c
diff --git a/src/soc/intel/broadwell/me_status.c b/src/soc/intel/broadwell/pch/me_status.c
index fa44c7c79d..fa44c7c79d 100644
--- a/src/soc/intel/broadwell/me_status.c
+++ b/src/soc/intel/broadwell/pch/me_status.c
diff --git a/src/soc/intel/broadwell/pch.c b/src/soc/intel/broadwell/pch/pch.c
index e0c5bb0c4d..e0c5bb0c4d 100644
--- a/src/soc/intel/broadwell/pch.c
+++ b/src/soc/intel/broadwell/pch/pch.c
diff --git a/src/soc/intel/broadwell/pcie.c b/src/soc/intel/broadwell/pch/pcie.c
index c98201e5ab..c98201e5ab 100644
--- a/src/soc/intel/broadwell/pcie.c
+++ b/src/soc/intel/broadwell/pch/pcie.c
diff --git a/src/soc/intel/broadwell/pmutil.c b/src/soc/intel/broadwell/pch/pmutil.c
index e63a981456..e63a981456 100644
--- a/src/soc/intel/broadwell/pmutil.c
+++ b/src/soc/intel/broadwell/pch/pmutil.c
diff --git a/src/soc/intel/broadwell/romstage/power_state.c b/src/soc/intel/broadwell/pch/power_state.c
index cb1d3e5b9c..cb1d3e5b9c 100644
--- a/src/soc/intel/broadwell/romstage/power_state.c
+++ b/src/soc/intel/broadwell/pch/power_state.c
diff --git a/src/soc/intel/broadwell/sata.c b/src/soc/intel/broadwell/pch/sata.c
index b496e53e3d..b496e53e3d 100644
--- a/src/soc/intel/broadwell/sata.c
+++ b/src/soc/intel/broadwell/pch/sata.c
diff --git a/src/soc/intel/broadwell/serialio.c b/src/soc/intel/broadwell/pch/serialio.c
index d32a27ddca..d32a27ddca 100644
--- a/src/soc/intel/broadwell/serialio.c
+++ b/src/soc/intel/broadwell/pch/serialio.c
diff --git a/src/soc/intel/broadwell/smbus.c b/src/soc/intel/broadwell/pch/smbus.c
index 70655fc891..70655fc891 100644
--- a/src/soc/intel/broadwell/smbus.c
+++ b/src/soc/intel/broadwell/pch/smbus.c
diff --git a/src/soc/intel/broadwell/smi.c b/src/soc/intel/broadwell/pch/smi.c
index d7704fd8fa..d7704fd8fa 100644
--- a/src/soc/intel/broadwell/smi.c
+++ b/src/soc/intel/broadwell/pch/smi.c
diff --git a/src/soc/intel/broadwell/smihandler.c b/src/soc/intel/broadwell/pch/smihandler.c
index fd5d4522fa..fd5d4522fa 100644
--- a/src/soc/intel/broadwell/smihandler.c
+++ b/src/soc/intel/broadwell/pch/smihandler.c
diff --git a/src/soc/intel/broadwell/romstage/uart.c b/src/soc/intel/broadwell/pch/uart.c
index 6b0da2d65c..6b0da2d65c 100644
--- a/src/soc/intel/broadwell/romstage/uart.c
+++ b/src/soc/intel/broadwell/pch/uart.c
diff --git a/src/soc/intel/broadwell/usb_debug.c b/src/soc/intel/broadwell/pch/usb_debug.c
index 0fda336d14..0fda336d14 100644
--- a/src/soc/intel/broadwell/usb_debug.c
+++ b/src/soc/intel/broadwell/pch/usb_debug.c
diff --git a/src/soc/intel/broadwell/xhci.c b/src/soc/intel/broadwell/pch/xhci.c
index baaf5ba6e6..baaf5ba6e6 100644
--- a/src/soc/intel/broadwell/xhci.c
+++ b/src/soc/intel/broadwell/pch/xhci.c
diff --git a/src/soc/intel/broadwell/romstage/Makefile.inc b/src/soc/intel/broadwell/romstage/Makefile.inc
index edfec30fdc..b77e7a579d 100644
--- a/src/soc/intel/broadwell/romstage/Makefile.inc
+++ b/src/soc/intel/broadwell/romstage/Makefile.inc
@@ -1,9 +1,6 @@
 romstage-y += ../../../../cpu/intel/car/romstage.c
 romstage-y += cpu.c
-romstage-y += pch.c
-romstage-y += power_state.c
 romstage-y += raminit.c
 romstage-y += report_platform.c
 romstage-y += romstage.c
 romstage-y += systemagent.c
-romstage-$(CONFIG_DRIVERS_UART_8250MEM) += uart.c