From c200e8c7cdebed98860a771888efbf998c5912b3 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Fri, 23 Oct 2020 21:37:21 +0200 Subject: [PATCH] soc/intel/broadwell: Move PCH code into pch subdir Change-Id: Icb57eb89b4f225298e43ae27970dc1e27fb6e222 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/46706 Reviewed-by: Arthur Heymans Tested-by: build bot (Jenkins) --- src/soc/intel/broadwell/Makefile.inc | 36 +----------------- src/soc/intel/broadwell/pch/Makefile.inc | 38 +++++++++++++++++++ src/soc/intel/broadwell/{ => pch}/adsp.c | 0 .../{bootblock/pch.c => pch/bootblock.c} | 0 .../{romstage/pch.c => pch/early_pch.c} | 0 src/soc/intel/broadwell/{ => pch}/ehci.c | 0 src/soc/intel/broadwell/{ => pch}/elog.c | 0 src/soc/intel/broadwell/{ => pch}/fadt.c | 0 src/soc/intel/broadwell/{ => pch}/gpio.c | 0 src/soc/intel/broadwell/{ => pch}/hda.c | 0 src/soc/intel/broadwell/{ => pch}/iobp.c | 0 src/soc/intel/broadwell/{ => pch}/lpc.c | 0 src/soc/intel/broadwell/{ => pch}/me.c | 0 src/soc/intel/broadwell/{ => pch}/me_status.c | 0 src/soc/intel/broadwell/{ => pch}/pch.c | 0 src/soc/intel/broadwell/{ => pch}/pcie.c | 0 src/soc/intel/broadwell/{ => pch}/pmutil.c | 0 .../broadwell/{romstage => pch}/power_state.c | 0 src/soc/intel/broadwell/{ => pch}/sata.c | 0 src/soc/intel/broadwell/{ => pch}/serialio.c | 0 src/soc/intel/broadwell/{ => pch}/smbus.c | 0 src/soc/intel/broadwell/{ => pch}/smi.c | 0 .../intel/broadwell/{ => pch}/smihandler.c | 0 .../intel/broadwell/{romstage => pch}/uart.c | 0 src/soc/intel/broadwell/{ => pch}/usb_debug.c | 0 src/soc/intel/broadwell/{ => pch}/xhci.c | 0 src/soc/intel/broadwell/romstage/Makefile.inc | 3 -- 27 files changed, 40 insertions(+), 37 deletions(-) create mode 100644 src/soc/intel/broadwell/pch/Makefile.inc rename src/soc/intel/broadwell/{ => pch}/adsp.c (100%) rename src/soc/intel/broadwell/{bootblock/pch.c => pch/bootblock.c} (100%) rename src/soc/intel/broadwell/{romstage/pch.c => pch/early_pch.c} (100%) rename src/soc/intel/broadwell/{ => pch}/ehci.c (100%) rename src/soc/intel/broadwell/{ => pch}/elog.c (100%) rename src/soc/intel/broadwell/{ => pch}/fadt.c (100%) rename src/soc/intel/broadwell/{ => pch}/gpio.c (100%) rename src/soc/intel/broadwell/{ => pch}/hda.c (100%) rename src/soc/intel/broadwell/{ => pch}/iobp.c (100%) rename src/soc/intel/broadwell/{ => pch}/lpc.c (100%) rename src/soc/intel/broadwell/{ => pch}/me.c (100%) rename src/soc/intel/broadwell/{ => pch}/me_status.c (100%) rename src/soc/intel/broadwell/{ => pch}/pch.c (100%) rename src/soc/intel/broadwell/{ => pch}/pcie.c (100%) rename src/soc/intel/broadwell/{ => pch}/pmutil.c (100%) rename src/soc/intel/broadwell/{romstage => pch}/power_state.c (100%) rename src/soc/intel/broadwell/{ => pch}/sata.c (100%) rename src/soc/intel/broadwell/{ => pch}/serialio.c (100%) rename src/soc/intel/broadwell/{ => pch}/smbus.c (100%) rename src/soc/intel/broadwell/{ => pch}/smi.c (100%) rename src/soc/intel/broadwell/{ => pch}/smihandler.c (100%) rename src/soc/intel/broadwell/{romstage => pch}/uart.c (100%) rename src/soc/intel/broadwell/{ => pch}/usb_debug.c (100%) rename src/soc/intel/broadwell/{ => pch}/xhci.c (100%) 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 similarity index 100% rename from src/soc/intel/broadwell/adsp.c rename to 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 similarity index 100% rename from src/soc/intel/broadwell/bootblock/pch.c rename to 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 similarity index 100% rename from src/soc/intel/broadwell/romstage/pch.c rename to 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 similarity index 100% rename from src/soc/intel/broadwell/ehci.c rename to src/soc/intel/broadwell/pch/ehci.c diff --git a/src/soc/intel/broadwell/elog.c b/src/soc/intel/broadwell/pch/elog.c similarity index 100% rename from src/soc/intel/broadwell/elog.c rename to src/soc/intel/broadwell/pch/elog.c diff --git a/src/soc/intel/broadwell/fadt.c b/src/soc/intel/broadwell/pch/fadt.c similarity index 100% rename from src/soc/intel/broadwell/fadt.c rename to src/soc/intel/broadwell/pch/fadt.c diff --git a/src/soc/intel/broadwell/gpio.c b/src/soc/intel/broadwell/pch/gpio.c similarity index 100% rename from src/soc/intel/broadwell/gpio.c rename to src/soc/intel/broadwell/pch/gpio.c diff --git a/src/soc/intel/broadwell/hda.c b/src/soc/intel/broadwell/pch/hda.c similarity index 100% rename from src/soc/intel/broadwell/hda.c rename to src/soc/intel/broadwell/pch/hda.c diff --git a/src/soc/intel/broadwell/iobp.c b/src/soc/intel/broadwell/pch/iobp.c similarity index 100% rename from src/soc/intel/broadwell/iobp.c rename to src/soc/intel/broadwell/pch/iobp.c diff --git a/src/soc/intel/broadwell/lpc.c b/src/soc/intel/broadwell/pch/lpc.c similarity index 100% rename from src/soc/intel/broadwell/lpc.c rename to src/soc/intel/broadwell/pch/lpc.c diff --git a/src/soc/intel/broadwell/me.c b/src/soc/intel/broadwell/pch/me.c similarity index 100% rename from src/soc/intel/broadwell/me.c rename to 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 similarity index 100% rename from src/soc/intel/broadwell/me_status.c rename to 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 similarity index 100% rename from src/soc/intel/broadwell/pch.c rename to src/soc/intel/broadwell/pch/pch.c diff --git a/src/soc/intel/broadwell/pcie.c b/src/soc/intel/broadwell/pch/pcie.c similarity index 100% rename from src/soc/intel/broadwell/pcie.c rename to src/soc/intel/broadwell/pch/pcie.c diff --git a/src/soc/intel/broadwell/pmutil.c b/src/soc/intel/broadwell/pch/pmutil.c similarity index 100% rename from src/soc/intel/broadwell/pmutil.c rename to 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 similarity index 100% rename from src/soc/intel/broadwell/romstage/power_state.c rename to 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 similarity index 100% rename from src/soc/intel/broadwell/sata.c rename to src/soc/intel/broadwell/pch/sata.c diff --git a/src/soc/intel/broadwell/serialio.c b/src/soc/intel/broadwell/pch/serialio.c similarity index 100% rename from src/soc/intel/broadwell/serialio.c rename to src/soc/intel/broadwell/pch/serialio.c diff --git a/src/soc/intel/broadwell/smbus.c b/src/soc/intel/broadwell/pch/smbus.c similarity index 100% rename from src/soc/intel/broadwell/smbus.c rename to src/soc/intel/broadwell/pch/smbus.c diff --git a/src/soc/intel/broadwell/smi.c b/src/soc/intel/broadwell/pch/smi.c similarity index 100% rename from src/soc/intel/broadwell/smi.c rename to src/soc/intel/broadwell/pch/smi.c diff --git a/src/soc/intel/broadwell/smihandler.c b/src/soc/intel/broadwell/pch/smihandler.c similarity index 100% rename from src/soc/intel/broadwell/smihandler.c rename to 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 similarity index 100% rename from src/soc/intel/broadwell/romstage/uart.c rename to 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 similarity index 100% rename from src/soc/intel/broadwell/usb_debug.c rename to 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 similarity index 100% rename from src/soc/intel/broadwell/xhci.c rename to 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