diff options
| author | Nico Huber <nico.h@gmx.de> | 2018-11-13 19:28:07 +0100 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-11-23 08:34:16 +0000 |
| commit | d67edcae6e9d438f2e60f6b67d97a7d3f09cb18b (patch) | |
| tree | 38d7fe7b769f4193ea3b4494dc7944b9718c678c /src/soc/intel/quark | |
| parent | 3032d7677883eb726d14fcd85efae7a7c068259a (diff) | |
| download | coreboot-d67edcae6e9d438f2e60f6b67d97a7d3f09cb18b.tar.xz | |
soc/intel/common: Bring DISPLAY_MTRRS into the light
Initially, I wanted to move only the Kconfig DISPLAY_MTRRS into the
"Debug" menu. It turned out, though, that the code looks rather generic.
No need to hide it in soc/intel/.
To not bloat src/Kconfig up any further, start a new `Kconfig.debug`
hierarchy just for debug options.
If somebody wants to review the code if it's 100% generic, we could
even get rid of HAVE_DISPLAY_MTRRS.
Change-Id: Ibd0a64121bd6e4ab5d7fd835f3ac25d3f5011f24
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/29684
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/soc/intel/quark')
| -rw-r--r-- | src/soc/intel/quark/Makefile.inc | 1 | ||||
| -rw-r--r-- | src/soc/intel/quark/bootblock/bootblock.c | 5 | ||||
| -rw-r--r-- | src/soc/intel/quark/include/soc/ramstage.h | 1 | ||||
| -rw-r--r-- | src/soc/intel/quark/romstage/mtrr.c | 1 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/soc/intel/quark/Makefile.inc b/src/soc/intel/quark/Makefile.inc index 741f5d3068..654f0a7d55 100644 --- a/src/soc/intel/quark/Makefile.inc +++ b/src/soc/intel/quark/Makefile.inc @@ -16,6 +16,7 @@ ifeq ($(CONFIG_SOC_INTEL_QUARK),y) subdirs-y += romstage +subdirs-y += ../../../cpu/x86/mtrr subdirs-y += ../../../cpu/x86/tsc bootblock-y += bootblock/esram_init.S diff --git a/src/soc/intel/quark/bootblock/bootblock.c b/src/soc/intel/quark/bootblock/bootblock.c index 38730eaabe..d3aa900214 100644 --- a/src/soc/intel/quark/bootblock/bootblock.c +++ b/src/soc/intel/quark/bootblock/bootblock.c @@ -15,10 +15,10 @@ */ #include <bootblock_common.h> #include <console/console.h> +#include <cpu/x86/mtrr.h> #include <device/pci_def.h> #include <program_loading.h> #include <soc/iomap.h> -#include <soc/intel/common/util.h> #include <soc/pci_devs.h> #include <soc/reg_access.h> @@ -112,8 +112,7 @@ void bootblock_soc_init(void) if (IS_ENABLED(CONFIG_ENABLE_DEBUG_LED_SOC_INIT_ENTRY)) light_sd_led(); - /* Display the MTRRs */ - soc_display_mtrrs(); + display_mtrrs(); } void platform_prog_run(struct prog *prog) diff --git a/src/soc/intel/quark/include/soc/ramstage.h b/src/soc/intel/quark/include/soc/ramstage.h index 4ad0fedc57..821f43e218 100644 --- a/src/soc/intel/quark/include/soc/ramstage.h +++ b/src/soc/intel/quark/include/soc/ramstage.h @@ -17,6 +17,7 @@ #ifndef _SOC_RAMSTAGE_H_ #define _SOC_RAMSTAGE_H_ +#include <arch/cpu.h> #include <chip.h> #include <device/device.h> #if IS_ENABLED(CONFIG_PLATFORM_USES_FSP1_1) diff --git a/src/soc/intel/quark/romstage/mtrr.c b/src/soc/intel/quark/romstage/mtrr.c index 6f2f00c862..47bfde4de6 100644 --- a/src/soc/intel/quark/romstage/mtrr.c +++ b/src/soc/intel/quark/romstage/mtrr.c @@ -16,7 +16,6 @@ #include <cpu/x86/msr.h> #include <cpu/x86/mtrr.h> -#include <soc/intel/common/util.h> #include <soc/pci_devs.h> #include <soc/reg_access.h> |