From cff6a1df3bacb9cd336c01c4ca5fe33ecd61dc80 Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Wed, 30 Jan 2019 11:35:18 +0530 Subject: soc/intel/cannonlake: Remove SOC_INTEL_CANNONLAKE_MEMCFG_INIT Kconfig This patch removes duplicate selects of same SOC_INTEL_CANNONLAKE_MEMCFG_INIT from various CFL/WHL SoC based boards to include cnl_memcfg_init.c file and include the cnl_memcfg_init.c file by default in CNL SoC Makefile.inc. Change-Id: Ib21ea305871dc859e7db0720c18a9479100346c3 Signed-off-by: Subrata Banik Reviewed-on: https://review.coreboot.org/c/31134 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh --- src/soc/intel/cannonlake/Kconfig | 4 ---- src/soc/intel/cannonlake/Makefile.inc | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'src/soc') diff --git a/src/soc/intel/cannonlake/Kconfig b/src/soc/intel/cannonlake/Kconfig index f8193cd754..0a1cff0938 100644 --- a/src/soc/intel/cannonlake/Kconfig +++ b/src/soc/intel/cannonlake/Kconfig @@ -170,10 +170,6 @@ config CPU_BCLK_MHZ int default 100 -config SOC_INTEL_CANNONLAKE_MEMCFG_INIT - bool - default n - config SOC_INTEL_COMMON_BLOCK_GSPI_CLOCK_MHZ int default 120 diff --git a/src/soc/intel/cannonlake/Makefile.inc b/src/soc/intel/cannonlake/Makefile.inc index b2ba0fd597..d1fc14179c 100644 --- a/src/soc/intel/cannonlake/Makefile.inc +++ b/src/soc/intel/cannonlake/Makefile.inc @@ -21,7 +21,7 @@ bootblock-y += lpc.c bootblock-y += p2sb.c bootblock-y += uart.c -romstage-$(CONFIG_SOC_INTEL_CANNONLAKE_MEMCFG_INIT) += cnl_memcfg_init.c +romstage-y += cnl_memcfg_init.c romstage-y += gspi.c romstage-y += i2c.c romstage-y += lpc.c -- cgit v1.2.3