aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/mainboard/google/veyron_jerry/Kconfig4
-rw-r--r--src/mainboard/google/veyron_mighty/Kconfig4
-rw-r--r--src/mainboard/google/veyron_pinky/Kconfig4
-rw-r--r--src/mainboard/google/veyron_speedy/Kconfig4
-rw-r--r--src/soc/rockchip/rk3288/Makefile.inc4
-rw-r--r--src/soc/rockchip/rk3288/media.c28
-rw-r--r--src/soc/rockchip/rk3288/spi.c75
7 files changed, 16 insertions, 107 deletions
diff --git a/src/mainboard/google/veyron_jerry/Kconfig b/src/mainboard/google/veyron_jerry/Kconfig
index b5aa2a43d0..4bf79da9f8 100644
--- a/src/mainboard/google/veyron_jerry/Kconfig
+++ b/src/mainboard/google/veyron_jerry/Kconfig
@@ -22,6 +22,8 @@ if BOARD_GOOGLE_VEYRON_JERRY
config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
select BOARD_ID_SUPPORT
+ select CHROMEOS_VBNV_EC
+ select COMMON_CBFS_SPI_WRAPPER
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_SPI
select EC_SOFTWARE_SYNC
@@ -33,6 +35,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select MAINBOARD_HAS_BOOTBLOCK_INIT
select HAVE_HARD_RESET
select RETURN_FROM_VERSTAGE
+ select SPI_FLASH
+ select SPI_FLASH_GIGADEVICE
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/veyron_mighty/Kconfig b/src/mainboard/google/veyron_mighty/Kconfig
index 3436f88684..6716cbe3ad 100644
--- a/src/mainboard/google/veyron_mighty/Kconfig
+++ b/src/mainboard/google/veyron_mighty/Kconfig
@@ -22,6 +22,8 @@ if BOARD_GOOGLE_VEYRON_MIGHTY
config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
select BOARD_ID_SUPPORT
+ select CHROMEOS_VBNV_EC
+ select COMMON_CBFS_SPI_WRAPPER
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_SPI
select EC_SOFTWARE_SYNC
@@ -33,6 +35,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select MAINBOARD_HAS_BOOTBLOCK_INIT
select HAVE_HARD_RESET
select RETURN_FROM_VERSTAGE
+ select SPI_FLASH
+ select SPI_FLASH_GIGADEVICE
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/veyron_pinky/Kconfig b/src/mainboard/google/veyron_pinky/Kconfig
index 810eea3c07..e7f55a3da8 100644
--- a/src/mainboard/google/veyron_pinky/Kconfig
+++ b/src/mainboard/google/veyron_pinky/Kconfig
@@ -22,6 +22,8 @@ if BOARD_GOOGLE_VEYRON_PINKY
config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
select BOARD_ID_SUPPORT
+ select CHROMEOS_VBNV_EC
+ select COMMON_CBFS_SPI_WRAPPER
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_SPI
select EC_SOFTWARE_SYNC
@@ -33,6 +35,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select MAINBOARD_HAS_BOOTBLOCK_INIT
select HAVE_HARD_RESET
select RETURN_FROM_VERSTAGE
+ select SPI_FLASH
+ select SPI_FLASH_GIGADEVICE
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/mainboard/google/veyron_speedy/Kconfig b/src/mainboard/google/veyron_speedy/Kconfig
index ee22cc9b47..d5e764cc06 100644
--- a/src/mainboard/google/veyron_speedy/Kconfig
+++ b/src/mainboard/google/veyron_speedy/Kconfig
@@ -23,6 +23,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
def_bool y
select BOARD_ID_SUPPORT
select BOARD_ROMSIZE_KB_4096
+ select CHROMEOS_VBNV_EC
+ select COMMON_CBFS_SPI_WRAPPER
select EC_GOOGLE_CHROMEEC
select EC_GOOGLE_CHROMEEC_SPI
select EC_SOFTWARE_SYNC
@@ -33,6 +35,8 @@ config BOARD_SPECIFIC_OPTIONS # dummy
select MAINBOARD_HAS_BOOTBLOCK_INIT
select HAVE_HARD_RESET
select RETURN_FROM_VERSTAGE
+ select SPI_FLASH
+ select SPI_FLASH_GIGADEVICE
select VIRTUAL_DEV_SWITCH
config MAINBOARD_DIR
diff --git a/src/soc/rockchip/rk3288/Makefile.inc b/src/soc/rockchip/rk3288/Makefile.inc
index 680bdb5429..4ad0c146ee 100644
--- a/src/soc/rockchip/rk3288/Makefile.inc
+++ b/src/soc/rockchip/rk3288/Makefile.inc
@@ -27,7 +27,6 @@ endif
bootblock-y += timer.c
bootblock-y += clock.c
bootblock-y += spi.c
-bootblock-y += media.c
bootblock-y += gpio.c
bootblock-y += i2c.c
bootblock-y += rk808.c
@@ -38,7 +37,6 @@ verstage-$(CONFIG_DRIVERS_UART) += uart.c
verstage-y += gpio.c
verstage-y += clock.c
verstage-y += i2c.c
-verstage-y += media.c
romstage-y += cbmem.c
romstage-y += timer.c
@@ -47,7 +45,6 @@ romstage-y += i2c.c
romstage-y += clock.c
romstage-y += gpio.c
romstage-y += spi.c
-romstage-y += media.c
romstage-y += sdram.c
romstage-y += rk808.c
romstage-y += pwm.c
@@ -60,7 +57,6 @@ ramstage-y += i2c.c
ramstage-y += clock.c
ramstage-y += spi.c
ramstage-y += gpio.c
-ramstage-y += media.c
ramstage-y += rk808.c
ramstage-y += pwm.c
ramstage-y += vop.c
diff --git a/src/soc/rockchip/rk3288/media.c b/src/soc/rockchip/rk3288/media.c
deleted file mode 100644
index 7f0ea518f2..0000000000
--- a/src/soc/rockchip/rk3288/media.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright 2014 Rockchip Inc.
- *
- * 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
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#include <cbfs.h>
-#include <soc/spi.h>
-#include <symbols.h>
-
-int init_default_cbfs_media(struct cbfs_media *media)
-{
- return initialize_rockchip_spi_cbfs_media(media,
- _cbfs_cache, _cbfs_cache_size);
-}
diff --git a/src/soc/rockchip/rk3288/spi.c b/src/soc/rockchip/rk3288/spi.c
index 499998978b..fe4e377a08 100644
--- a/src/soc/rockchip/rk3288/spi.c
+++ b/src/soc/rockchip/rk3288/spi.c
@@ -297,78 +297,3 @@ struct rockchip_spi_media {
struct spi_slave *slave;
struct cbfs_simple_buffer buffer;
};
-
-static int rockchip_spi_cbfs_open(struct cbfs_media *media)
-{
- return 0;
-}
-
-static int rockchip_spi_cbfs_close(struct cbfs_media *media)
-{
- return 0;
-}
-
-static size_t rockchip_spi_cbfs_read(struct cbfs_media *media, void *dest,
- size_t offset, size_t count)
-{
- unsigned int cmd;
- struct rockchip_spi_media *spi =
- (struct rockchip_spi_media *)media->context;
- int ret;
-
- spi_claim_bus(spi->slave);
- cmd = swab32(offset) | SF_READ_DATA_CMD;
- if (spi_xfer(spi->slave, &cmd, sizeof(cmd), NULL, 0)) {
- printk(BIOS_DEBUG, "%s: could not send command\n", __func__);
- ret = 0;
- goto rockchip_spi_cbfs_read_done;
- }
-
- if (spi_xfer(spi->slave, NULL, 0, dest, count)) {
- printk(BIOS_DEBUG, "%s: could not receive data\n", __func__);
- ret = 0;
- goto rockchip_spi_cbfs_read_done;
- }
-
-rockchip_spi_cbfs_read_done:
- spi_release_bus(spi->slave);
- return ret < 0 ? 0 : count;
-}
-
-static void *rockchip_spi_cbfs_map(struct cbfs_media *media, size_t offset,
- size_t count)
-{
- struct rockchip_spi_media *spi =
- (struct rockchip_spi_media *)media->context;
-
- count = ALIGN_UP(count, 4);
-
- return cbfs_simple_buffer_map(&spi->buffer, media, offset, count);
-}
-
-static void *rockchip_spi_cbfs_unmap(struct cbfs_media *media,
- const void *address)
-{
- struct rockchip_spi_media *spi =
- (struct rockchip_spi_media *)media->context;
- return cbfs_simple_buffer_unmap(&spi->buffer, address);
-}
-
-int initialize_rockchip_spi_cbfs_media(struct cbfs_media *media,
- void *buffer_address, size_t buffer_size)
-{
- static struct rockchip_spi_media context;
- static struct rockchip_spi_slave *eslave = &rockchip_spi_slaves[2];
- context.slave = &eslave->slave;
- context.buffer.allocated = context.buffer.last_allocate = 0;
- context.buffer.buffer = buffer_address;
- context.buffer.size = buffer_size;
- media->context = (void *)&context;
- media->open = rockchip_spi_cbfs_open;
- media->close = rockchip_spi_cbfs_close;
- media->read = rockchip_spi_cbfs_read;
- media->map = rockchip_spi_cbfs_map;
- media->unmap = rockchip_spi_cbfs_unmap;
-
- return 0;
-}
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-26 21:48:20 +0000