From 15129b4db44fd63b1fe7076d7825c1f8bd00588d Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Tue, 7 Nov 2017 17:50:48 +0530 Subject: soc/intel/apollolake: Make use of Intel SPI common block TEST=Build and boot reef Change-Id: I1bb22ef1737b9e35892294ec0d66df39c546d72e Signed-off-by: Subrata Banik Reviewed-on: https://review.coreboot.org/22364 Tested-by: build bot (Jenkins) Reviewed-by: Furquan Shaikh Reviewed-by: Aaron Durbin --- src/soc/intel/apollolake/Kconfig | 1 + src/soc/intel/apollolake/Makefile.inc | 3 +-- src/soc/intel/apollolake/spi.c | 10 +--------- 3 files changed, 3 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/soc/intel/apollolake/Kconfig b/src/soc/intel/apollolake/Kconfig index cf2492c509..f568799026 100644 --- a/src/soc/intel/apollolake/Kconfig +++ b/src/soc/intel/apollolake/Kconfig @@ -86,6 +86,7 @@ config CPU_SPECIFIC_OPTIONS select SOC_INTEL_COMMON_BLOCK_XDCI select SOC_INTEL_COMMON_BLOCK_XHCI select SOC_INTEL_COMMON_BLOCK_SMM + select SOC_INTEL_COMMON_BLOCK_SPI select SOC_INTEL_COMMON_SPI_FLASH_PROTECT select UDELAY_TSC select TSC_CONSTANT_RATE diff --git a/src/soc/intel/apollolake/Makefile.inc b/src/soc/intel/apollolake/Makefile.inc index c295e36e5e..14932dde84 100644 --- a/src/soc/intel/apollolake/Makefile.inc +++ b/src/soc/intel/apollolake/Makefile.inc @@ -57,13 +57,12 @@ ramstage-y += memmap.c ramstage-y += mmap_boot.c ramstage-y += uart.c ramstage-y += nhlt.c -ramstage-y += systemagent.c ramstage-y += spi.c +ramstage-y += systemagent.c ramstage-y += pmutil.c ramstage-y += pmc.c ramstage-y += reset.c ramstage-y += sram.c -ramstage-y += spi.c ramstage-y += xdci.c ramstage-y += sd.c diff --git a/src/soc/intel/apollolake/spi.c b/src/soc/intel/apollolake/spi.c index fecb0cfd26..8d9f000226 100644 --- a/src/soc/intel/apollolake/spi.c +++ b/src/soc/intel/apollolake/spi.c @@ -2,6 +2,7 @@ * This file is part of the coreboot project. * * Copyright 2016 Google Inc. + * Copyright 2017 Intel Corporation * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -14,11 +15,8 @@ * GNU General Public License for more details. */ -#include -#include #include #include -#include int spi_soc_devfn_to_bus(unsigned int devfn) { @@ -45,9 +43,3 @@ int spi_soc_bus_to_devfn(unsigned int bus) } return -1; } - -const struct spi_ctrlr_buses spi_ctrlr_bus_map[] = { - { .ctrlr = &fast_spi_flash_ctrlr, .bus_start = 0, .bus_end = 0 }, -}; - -const size_t spi_ctrlr_bus_map_count = ARRAY_SIZE(spi_ctrlr_bus_map); -- cgit v1.2.3