diff options
| -rw-r--r-- | src/Kconfig | 8 | ||||
| -rw-r--r-- | src/drivers/spi/Kconfig | 8 | ||||
| -rw-r--r-- | src/drivers/spi/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/drivers/spi/cbfs_spi.c (renamed from src/lib/cbfs_spi.c) | 0 | ||||
| -rw-r--r-- | src/lib/Makefile.inc | 5 |
5 files changed, 12 insertions, 13 deletions
diff --git a/src/Kconfig b/src/Kconfig index f7a924f5c3..fd98cc8cb1 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -35,14 +35,6 @@ config CBFS_PREFIX Select the prefix to all files put into the image. It's "fallback" by default, "normal" is a common alternative. -config COMMON_CBFS_SPI_WRAPPER - bool - default n - depends on SPI_FLASH - depends on !ARCH_X86 - help - Use common wrapper to interface CBFS to SPI bootrom. - choice prompt "Compiler to use" default COMPILER_GCC diff --git a/src/drivers/spi/Kconfig b/src/drivers/spi/Kconfig index b0187fda0d..030fa6cd12 100644 --- a/src/drivers/spi/Kconfig +++ b/src/drivers/spi/Kconfig @@ -13,6 +13,14 @@ ## GNU General Public License for more details. ## +config COMMON_CBFS_SPI_WRAPPER + bool + default n + depends on !ARCH_X86 + depends on BOOT_DEVICE_SPI_FLASH + help + Use common wrapper to interface CBFS to SPI bootrom. + config SPI_FLASH bool default y if BOOT_DEVICE_SPI_FLASH diff --git a/src/drivers/spi/Makefile.inc b/src/drivers/spi/Makefile.inc index 6b4182e4e3..e976059fda 100644 --- a/src/drivers/spi/Makefile.inc +++ b/src/drivers/spi/Makefile.inc @@ -8,6 +8,7 @@ smm-$(CONFIG_DEBUG_SMI) += spiconsole.c endif ifeq ($(CONFIG_COMMON_CBFS_SPI_WRAPPER),y) +bootblock-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c bootblock-y += spi_flash.c bootblock-$(CONFIG_SPI_FLASH_EON) += eon.c bootblock-$(CONFIG_SPI_FLASH_GIGADEVICE) += gigadevice.c @@ -18,6 +19,7 @@ bootblock-$(CONFIG_SPI_FLASH_STMICRO) += stmicro.c bootblock-$(CONFIG_SPI_FLASH_WINBOND) += winbond.c bootblock-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.c +romstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c romstage-$(CONFIG_SPI_FLASH) += spi_flash.c romstage-$(CONFIG_SPI_FLASH_EON) += eon.c romstage-$(CONFIG_SPI_FLASH_GIGADEVICE) += gigadevice.c @@ -28,6 +30,7 @@ romstage-$(CONFIG_SPI_FLASH_STMICRO) += stmicro.c romstage-$(CONFIG_SPI_FLASH_WINBOND) += winbond.c romstage-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.c +verstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c verstage-$(CONFIG_SPI_FLASH) += spi_flash.c verstage-$(CONFIG_SPI_FLASH_EON) += eon.c verstage-$(CONFIG_SPI_FLASH_GIGADEVICE) += gigadevice.c @@ -40,6 +43,7 @@ verstage-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.c endif +ramstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c ramstage-$(CONFIG_SPI_FLASH) += spi_flash.c # drivers diff --git a/src/lib/cbfs_spi.c b/src/drivers/spi/cbfs_spi.c index bbe9125dd5..bbe9125dd5 100644 --- a/src/lib/cbfs_spi.c +++ b/src/drivers/spi/cbfs_spi.c diff --git a/src/lib/Makefile.inc b/src/lib/Makefile.inc index 5f708a6d3c..e2cf9eff67 100644 --- a/src/lib/Makefile.inc +++ b/src/lib/Makefile.inc @@ -22,7 +22,6 @@ endif bootblock-y += prog_loaders.c bootblock-y += prog_ops.c bootblock-y += cbfs.c -bootblock-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c bootblock-$(CONFIG_GENERIC_GPIO_LIB) += gpio.c bootblock-y += libgcc.c bootblock-$(CONFIG_GENERIC_UDELAY) += timer.c @@ -49,7 +48,6 @@ verstage-y += memcmp.c verstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c verstage-y += boot_device.c verstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c -verstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c ifeq ($(MOCK_TPM),1) libverstage-y += mocked_tlcl.c @@ -73,7 +71,6 @@ $(foreach arch,$(ARCH_SUPPORTED),\ romstage-y += fmap.c romstage-y += delay.c romstage-y += cbfs.c -romstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c romstage-$(CONFIG_COMPRESS_RAMSTAGE) += lzma.c lzmadecode.c romstage-y += libgcc.c romstage-y += memrange.c @@ -117,7 +114,6 @@ ramstage-y += delay.c ramstage-y += fallback_boot.c ramstage-y += compute_ip_checksum.c ramstage-y += cbfs.c -ramstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c ramstage-y += lzma.c lzmadecode.c ramstage-y += stack.c ramstage-y += hexstrtobin.c @@ -214,7 +210,6 @@ smm-y += halt.c postcar-y += bootmode.c postcar-y += boot_device.c postcar-y += cbfs.c -postcar-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c postcar-y += delay.c postcar-y += fmap.c postcar-y += gcc.c |