sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers/spi: move cbfs_spi.c location

Browse Source 
The common boot device spi implementation is very much
specific to SPI flash. As such it should be moved into
that subdirectory. It's still a high-level option but
it correctly depends on BOOT_DEVICE_SPI_FLASH. Additionally
that allows the auto-selection of SPI_FLASH by a platform
selecting COMMON_CBFS_SPI_WRAPPER which allows for culling
of SPI_FLASH selections everywhere.

BUG=chrome-os-partner:56151

Change-Id: Ia2ccfdc9e1a4348cd91b381f9712d8853b7d2a79
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: https://review.coreboot.org/16212
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Martin Roth <martinroth@google.com>
This commit is contained in:
Aaron Durbin
2016-08-12 15:50:16 -05:00
committed by Martin Roth
parent 16c173fdf5
commit 3326f15991
5 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Kconfig
View File

@@ -35,14 +35,6 @@ config CBFS_PREFIX
Select the prefix to all files put into the image. It's "fallback" Select the prefix to all files put into the image. It's "fallback"
by default, "normal" is a common alternative. 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 choice
prompt "Compiler to use" prompt "Compiler to use"
default COMPILER_GCC default COMPILER_GCC

8
src/drivers/spi/Kconfig
View File

@@ -13,6 +13,14 @@
## GNU General Public License for more details. ## 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 config SPI_FLASH
bool bool
default y if BOOT_DEVICE_SPI_FLASH default y if BOOT_DEVICE_SPI_FLASH

4
src/drivers/spi/Makefile.inc
View File

@@ -8,6 +8,7 @@ smm-$(CONFIG_DEBUG_SMI) += spiconsole.c
endif endif
ifeq ($(CONFIG_COMMON_CBFS_SPI_WRAPPER),y) ifeq ($(CONFIG_COMMON_CBFS_SPI_WRAPPER),y)
bootblock-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c
bootblock-y += spi_flash.c bootblock-y += spi_flash.c
bootblock-$(CONFIG_SPI_FLASH_EON) += eon.c bootblock-$(CONFIG_SPI_FLASH_EON) += eon.c
bootblock-$(CONFIG_SPI_FLASH_GIGADEVICE) += gigadevice.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_FLASH_WINBOND) += winbond.c
bootblock-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.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) += spi_flash.c
romstage-$(CONFIG_SPI_FLASH_EON) += eon.c romstage-$(CONFIG_SPI_FLASH_EON) += eon.c
romstage-$(CONFIG_SPI_FLASH_GIGADEVICE) += gigadevice.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_FLASH_WINBOND) += winbond.c
romstage-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.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) += spi_flash.c
verstage-$(CONFIG_SPI_FLASH_EON) += eon.c verstage-$(CONFIG_SPI_FLASH_EON) += eon.c
verstage-$(CONFIG_SPI_FLASH_GIGADEVICE) += gigadevice.c verstage-$(CONFIG_SPI_FLASH_GIGADEVICE) += gigadevice.c
@@ -40,6 +43,7 @@ verstage-$(CONFIG_SPI_FRAM_RAMTRON) += ramtron.c
endif endif
ramstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c
ramstage-$(CONFIG_SPI_FLASH) += spi_flash.c ramstage-$(CONFIG_SPI_FLASH) += spi_flash.c
# drivers # drivers

0
src/lib/cbfs_spi.c → src/drivers/spi/cbfs_spi.c
View File

5
src/lib/Makefile.inc
View File

@@ -22,7 +22,6 @@ endif
bootblock-y += prog_loaders.c bootblock-y += prog_loaders.c
bootblock-y += prog_ops.c bootblock-y += prog_ops.c
bootblock-y += cbfs.c bootblock-y += cbfs.c
bootblock-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c
bootblock-$(CONFIG_GENERIC_GPIO_LIB) += gpio.c bootblock-$(CONFIG_GENERIC_GPIO_LIB) += gpio.c
bootblock-y += libgcc.c bootblock-y += libgcc.c
bootblock-$(CONFIG_GENERIC_UDELAY) += timer.c bootblock-$(CONFIG_GENERIC_UDELAY) += timer.c
@@ -49,7 +48,6 @@ verstage-y += memcmp.c
verstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c verstage-$(CONFIG_COLLECT_TIMESTAMPS) += timestamp.c
verstage-y += boot_device.c verstage-y += boot_device.c
verstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c verstage-$(CONFIG_CONSOLE_CBMEM) += cbmem_console.c
verstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c
ifeq ($(MOCK_TPM),1) ifeq ($(MOCK_TPM),1)
libverstage-y += mocked_tlcl.c libverstage-y += mocked_tlcl.c
@@ -73,7 +71,6 @@ $(foreach arch,$(ARCH_SUPPORTED),\
romstage-y += fmap.c romstage-y += fmap.c
romstage-y += delay.c romstage-y += delay.c
romstage-y += cbfs.c romstage-y += cbfs.c
romstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c
romstage-$(CONFIG_COMPRESS_RAMSTAGE) += lzma.c lzmadecode.c romstage-$(CONFIG_COMPRESS_RAMSTAGE) += lzma.c lzmadecode.c
romstage-y += libgcc.c romstage-y += libgcc.c
romstage-y += memrange.c romstage-y += memrange.c
@@ -117,7 +114,6 @@ ramstage-y += delay.c
ramstage-y += fallback_boot.c ramstage-y += fallback_boot.c
ramstage-y += compute_ip_checksum.c ramstage-y += compute_ip_checksum.c
ramstage-y += cbfs.c ramstage-y += cbfs.c
ramstage-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c
ramstage-y += lzma.c lzmadecode.c ramstage-y += lzma.c lzmadecode.c
ramstage-y += stack.c ramstage-y += stack.c
ramstage-y += hexstrtobin.c ramstage-y += hexstrtobin.c
@@ -214,7 +210,6 @@ smm-y += halt.c
postcar-y += bootmode.c postcar-y += bootmode.c
postcar-y += boot_device.c postcar-y += boot_device.c
postcar-y += cbfs.c postcar-y += cbfs.c
postcar-$(CONFIG_COMMON_CBFS_SPI_WRAPPER) += cbfs_spi.c
postcar-y += delay.c postcar-y += delay.c
postcar-y += fmap.c postcar-y += fmap.c
postcar-y += gcc.c postcar-y += gcc.c