From 9616f3ceb7e6bb2a55b0de01a5364fca011a1ecb Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Wed, 29 Apr 2015 10:45:22 -0700 Subject: kbuild: Don't require intel/common changes for every soc In the true spirit of separating components more strictly and allowing to add new components to coreboot without touching existing code, move Intel common code selection to the soc Kconfig and out of src/soc/intel/common/Makefile.inc Change-Id: I0a70656bb9f4550b6088e9f45e68b5106c0eb9af Signed-off-by: Stefan Reinauer Reviewed-on: http://review.coreboot.org/10031 Tested-by: build bot (Jenkins) Reviewed-by: Leroy P Leahy Reviewed-by: Patrick Georgi --- src/soc/intel/baytrail/Kconfig | 1 + src/soc/intel/broadwell/Kconfig | 1 + src/soc/intel/common/Kconfig | 5 +++++ src/soc/intel/common/Makefile.inc | 2 +- 4 files changed, 8 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/soc/intel/baytrail/Kconfig b/src/soc/intel/baytrail/Kconfig index 214a1ac231..0b3e1763f4 100644 --- a/src/soc/intel/baytrail/Kconfig +++ b/src/soc/intel/baytrail/Kconfig @@ -37,6 +37,7 @@ config CPU_SPECIFIC_OPTIONS select TSC_MONOTONIC_TIMER select TSC_SYNC_MFENCE select UDELAY_TSC + select SOC_INTEL_COMMON config BOOTBLOCK_CPU_INIT string diff --git a/src/soc/intel/broadwell/Kconfig b/src/soc/intel/broadwell/Kconfig index d8406321ed..91249ee007 100644 --- a/src/soc/intel/broadwell/Kconfig +++ b/src/soc/intel/broadwell/Kconfig @@ -48,6 +48,7 @@ config CPU_SPECIFIC_OPTIONS select TSC_SYNC_MFENCE select UDELAY_TSC select PER_DEVICE_ACPI_TABLES + select SOC_INTEL_COMMON config BOOTBLOCK_CPU_INIT string diff --git a/src/soc/intel/common/Kconfig b/src/soc/intel/common/Kconfig index 1dce4e3a6c..8b5cef354e 100644 --- a/src/soc/intel/common/Kconfig +++ b/src/soc/intel/common/Kconfig @@ -1,3 +1,8 @@ +config SOC_INTEL_COMMON + bool + help + common code for Intel SOCs + if HAVE_MRC config CACHE_MRC_SETTINGS diff --git a/src/soc/intel/common/Makefile.inc b/src/soc/intel/common/Makefile.inc index 46786e2d1a..6d40aa7037 100644 --- a/src/soc/intel/common/Makefile.inc +++ b/src/soc/intel/common/Makefile.inc @@ -1,4 +1,4 @@ -ifeq ($(CONFIG_SOC_INTEL_BAYTRAIL)$(CONFIG_SOC_INTEL_BROADWELL),y) +ifeq ($(CONFIG_SOC_INTEL_COMMON),y) ramstage-y += hda_verb.c ramstage-$(CONFIG_CACHE_MRC_SETTINGS) += nvm.c -- cgit v1.2.3