Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/55582 )
Change subject: soc/intel/broadwell: Rename `ramstage.h` ......................................................................
soc/intel/broadwell: Rename `ramstage.h`
This file only contains the `broadwell_run_reference_code()` function prototype (either a declaration or an inline stub definition). Rename this file to refcode.h and only include it where necessary.
Tested with BUILD_TIMELESS=1, Purism Librem 13 v1 remains identical.
Change-Id: I6513f45b8914a84312b27ef4860870a89fd0aab3 Signed-off-by: Angel Pons th3fanbus@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/55582 Reviewed-by: Felix Held felix-coreboot@felixheld.de Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/soc/intel/broadwell/gma.c R src/soc/intel/broadwell/include/soc/refcode.h M src/soc/intel/broadwell/minihd.c M src/soc/intel/broadwell/northbridge.c M src/soc/intel/broadwell/pch/adsp.c M src/soc/intel/broadwell/pch/hda.c M src/soc/intel/broadwell/pch/lpc.c M src/soc/intel/broadwell/pch/me.c M src/soc/intel/broadwell/pch/pch.c M src/soc/intel/broadwell/pch/sata.c M src/soc/intel/broadwell/pch/serialio.c M src/soc/intel/broadwell/pch/usb_xhci.c M src/soc/intel/broadwell/refcode.c 13 files changed, 5 insertions(+), 17 deletions(-)
Approvals: build bot (Jenkins): Verified Felix Held: Looks good to me, approved
diff --git a/src/soc/intel/broadwell/gma.c b/src/soc/intel/broadwell/gma.c index dcbd1e3..b3e010c 100644 --- a/src/soc/intel/broadwell/gma.c +++ b/src/soc/intel/broadwell/gma.c @@ -18,7 +18,6 @@ #include <drivers/intel/gma/libgfxinit.h> #include <drivers/intel/gma/opregion.h> #include <soc/pm.h> -#include <soc/ramstage.h> #include <soc/systemagent.h> #include <soc/intel/broadwell/chip.h> #include <security/vboot/vbnv.h> diff --git a/src/soc/intel/broadwell/include/soc/ramstage.h b/src/soc/intel/broadwell/include/soc/refcode.h similarity index 60% rename from src/soc/intel/broadwell/include/soc/ramstage.h rename to src/soc/intel/broadwell/include/soc/refcode.h index 3900c73..19c2e49 100644 --- a/src/soc/intel/broadwell/include/soc/ramstage.h +++ b/src/soc/intel/broadwell/include/soc/refcode.h @@ -1,10 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#ifndef _BROADWELL_RAMSTAGE_H_ -#define _BROADWELL_RAMSTAGE_H_ - -#include <device/device.h> -#include <soc/intel/broadwell/chip.h> +#ifndef BROADWELL_REFCODE_H +#define BROADWELL_REFCODE_H
#if CONFIG(HAVE_REFCODE_BLOB) void broadwell_run_reference_code(void); diff --git a/src/soc/intel/broadwell/minihd.c b/src/soc/intel/broadwell/minihd.c index 6d96eb3..b73c1b3 100644 --- a/src/soc/intel/broadwell/minihd.c +++ b/src/soc/intel/broadwell/minihd.c @@ -7,7 +7,6 @@ #include <device/pci_ops.h> #include <device/mmio.h> #include <soc/intel/common/hda_verb.h> -#include <soc/ramstage.h> #include <soc/igd.h>
static const u32 minihd_verb_table[] = { diff --git a/src/soc/intel/broadwell/northbridge.c b/src/soc/intel/broadwell/northbridge.c index 623ab70..76ea35f 100644 --- a/src/soc/intel/broadwell/northbridge.c +++ b/src/soc/intel/broadwell/northbridge.c @@ -12,7 +12,7 @@ #include <soc/acpi.h> #include <soc/iomap.h> #include <soc/pci_devs.h> -#include <soc/ramstage.h> +#include <soc/refcode.h> #include <soc/systemagent.h>
u8 systemagent_revision(void) diff --git a/src/soc/intel/broadwell/pch/adsp.c b/src/soc/intel/broadwell/pch/adsp.c index b4b0257..3cc7e12 100644 --- a/src/soc/intel/broadwell/pch/adsp.c +++ b/src/soc/intel/broadwell/pch/adsp.c @@ -8,7 +8,6 @@ #include <device/mmio.h> #include <soc/adsp.h> #include <soc/pch.h> -#include <soc/ramstage.h> #include <soc/rcba.h> #include <soc/intel/broadwell/pch/chip.h> #include <southbridge/intel/lynxpoint/iobp.h> diff --git a/src/soc/intel/broadwell/pch/hda.c b/src/soc/intel/broadwell/pch/hda.c index ba7d342..ab348ea 100644 --- a/src/soc/intel/broadwell/pch/hda.c +++ b/src/soc/intel/broadwell/pch/hda.c @@ -9,7 +9,6 @@ #include <device/mmio.h> #include <soc/intel/common/hda_verb.h> #include <soc/pch.h> -#include <soc/ramstage.h> #include <soc/rcba.h>
static void codecs_init(u8 *base, u32 codec_mask) diff --git a/src/soc/intel/broadwell/pch/lpc.c b/src/soc/intel/broadwell/pch/lpc.c index 10cc9d8..13e4fd7e 100644 --- a/src/soc/intel/broadwell/pch/lpc.c +++ b/src/soc/intel/broadwell/pch/lpc.c @@ -16,7 +16,6 @@ #include <soc/pch.h> #include <soc/pci_devs.h> #include <soc/pm.h> -#include <soc/ramstage.h> #include <soc/rcba.h> #include <soc/intel/broadwell/pch/chip.h> #include <acpi/acpigen.h> diff --git a/src/soc/intel/broadwell/pch/me.c b/src/soc/intel/broadwell/pch/me.c index 6c01f07..22db6a7 100644 --- a/src/soc/intel/broadwell/pch/me.c +++ b/src/soc/intel/broadwell/pch/me.c @@ -24,7 +24,6 @@ #include <soc/lpc.h> #include <soc/pch.h> #include <soc/pci_devs.h> -#include <soc/ramstage.h> #include <soc/rcba.h> #include <soc/intel/broadwell/pch/chip.h>
diff --git a/src/soc/intel/broadwell/pch/pch.c b/src/soc/intel/broadwell/pch/pch.c index 20e2431..da13503 100644 --- a/src/soc/intel/broadwell/pch/pch.c +++ b/src/soc/intel/broadwell/pch/pch.c @@ -7,7 +7,7 @@ #include <device/pci_def.h> #include <soc/pch.h> #include <soc/pci_devs.h> -#include <soc/ramstage.h> +#include <drivers/intel/gma/gma.h> /* TODO: for reproducibility purposes only */ #include <soc/rcba.h> #include <soc/serialio.h> #include <soc/spi.h> diff --git a/src/soc/intel/broadwell/pch/sata.c b/src/soc/intel/broadwell/pch/sata.c index b8ef527..8343775 100644 --- a/src/soc/intel/broadwell/pch/sata.c +++ b/src/soc/intel/broadwell/pch/sata.c @@ -7,7 +7,6 @@ #include <device/pci.h> #include <device/pci_ids.h> #include <delay.h> -#include <soc/ramstage.h> #include <soc/rcba.h> #include <soc/sata.h> #include <soc/intel/broadwell/pch/chip.h> diff --git a/src/soc/intel/broadwell/pch/serialio.c b/src/soc/intel/broadwell/pch/serialio.c index 1d67738..601bf97 100644 --- a/src/soc/intel/broadwell/pch/serialio.c +++ b/src/soc/intel/broadwell/pch/serialio.c @@ -8,7 +8,6 @@ #include <device/pci_ids.h> #include <soc/pci_devs.h> #include <soc/pch.h> -#include <soc/ramstage.h> #include <soc/rcba.h> #include <soc/serialio.h> #include <soc/intel/broadwell/pch/chip.h> diff --git a/src/soc/intel/broadwell/pch/usb_xhci.c b/src/soc/intel/broadwell/pch/usb_xhci.c index fd36fad..b766425 100644 --- a/src/soc/intel/broadwell/pch/usb_xhci.c +++ b/src/soc/intel/broadwell/pch/usb_xhci.c @@ -8,7 +8,6 @@ #include <acpi/acpi.h> #include <device/mmio.h> #include <device/pci_ops.h> -#include <soc/ramstage.h> #include <soc/xhci.h>
#ifdef __SIMPLE_DEVICE__ diff --git a/src/soc/intel/broadwell/refcode.c b/src/soc/intel/broadwell/refcode.c index ae175b0..9d4bd2d 100644 --- a/src/soc/intel/broadwell/refcode.c +++ b/src/soc/intel/broadwell/refcode.c @@ -11,7 +11,7 @@ #include <soc/pei_data.h> #include <soc/pei_wrapper.h> #include <soc/pm.h> -#include <soc/ramstage.h> +#include <soc/refcode.h>
static pei_wrapper_entry_t load_reference_code(void) {