diff options
| author | Julius Werner <jwerner@chromium.org> | 2014-12-19 12:41:16 -0800 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2015-04-17 09:20:38 +0200 |
| commit | b7641cc23003970cdb2c1fc3af8acba8ad79b638 (patch) | |
| tree | 628a72081bb49c934eb479f210b8f263ecde9e4a /src | |
| parent | c14e42623bede2480284cf500362d545f85f8f69 (diff) | |
veyron: Activate Winbond SPI driver
This patch activates the chip driver for Winbond SPI flash (which,
incidentally, looks 99.9% the same as the Gigadevice driver but still
requires some extra 500+ bytes of object code... there's definitely room
for improvement here). Shuffle around rk3288 memlayout to make a little
more room in the bootblock.
BRANCH=veyron
BUG=chrome-os-partner:34176
TEST=Booted Pinky. Checked bootblock and verstage memsz of final binary
and noticed that both only have less than 500 bytes left against their
memlayout boundary. The next piece of code we add will cause some
serious headaches...
Change-Id: I97ea6ac334104e4219e310afc557c164b2ff19d9
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Original-Commit-Id: 8769e5a34ad3cd417132646fbb58ff51c29fb640
Original-Change-Id: Id2f1204c30aa28251cf85cb80d7ca44947388dba
Original-Signed-off-by: Julius Werner <jwerner@chromium.org>
Original-Reviewed-on: https://chromium-review.googlesource.com/236977
Original-Reviewed-by: David Hendricks <dhendrix@chromium.org>
Reviewed-on: http://review.coreboot.org/9719
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mainboard/google/veyron_jerry/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/google/veyron_mighty/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/google/veyron_pinky/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/google/veyron_speedy/Kconfig | 1 | ||||
| -rw-r--r-- | src/soc/rockchip/rk3288/include/soc/memlayout.ld | 6 |
5 files changed, 7 insertions, 3 deletions
diff --git a/src/mainboard/google/veyron_jerry/Kconfig b/src/mainboard/google/veyron_jerry/Kconfig index 0eda36cc05..b9205ecaa7 100644 --- a/src/mainboard/google/veyron_jerry/Kconfig +++ b/src/mainboard/google/veyron_jerry/Kconfig @@ -37,6 +37,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select RETURN_FROM_VERSTAGE select SPI_FLASH select SPI_FLASH_GIGADEVICE + select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH config MAINBOARD_DIR diff --git a/src/mainboard/google/veyron_mighty/Kconfig b/src/mainboard/google/veyron_mighty/Kconfig index bff499aa9d..9bc571322c 100644 --- a/src/mainboard/google/veyron_mighty/Kconfig +++ b/src/mainboard/google/veyron_mighty/Kconfig @@ -37,6 +37,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select RETURN_FROM_VERSTAGE select SPI_FLASH select SPI_FLASH_GIGADEVICE + select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH config MAINBOARD_DIR diff --git a/src/mainboard/google/veyron_pinky/Kconfig b/src/mainboard/google/veyron_pinky/Kconfig index 08588c8ac5..c3a47e54b0 100644 --- a/src/mainboard/google/veyron_pinky/Kconfig +++ b/src/mainboard/google/veyron_pinky/Kconfig @@ -37,6 +37,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select RETURN_FROM_VERSTAGE select SPI_FLASH select SPI_FLASH_GIGADEVICE + select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH config MAINBOARD_DIR diff --git a/src/mainboard/google/veyron_speedy/Kconfig b/src/mainboard/google/veyron_speedy/Kconfig index 833d94bbd3..bbc3fc84ef 100644 --- a/src/mainboard/google/veyron_speedy/Kconfig +++ b/src/mainboard/google/veyron_speedy/Kconfig @@ -37,6 +37,7 @@ config BOARD_SPECIFIC_OPTIONS # dummy select RETURN_FROM_VERSTAGE select SPI_FLASH select SPI_FLASH_GIGADEVICE + select SPI_FLASH_WINBOND select VIRTUAL_DEV_SWITCH config MAINBOARD_DIR diff --git a/src/soc/rockchip/rk3288/include/soc/memlayout.ld b/src/soc/rockchip/rk3288/include/soc/memlayout.ld index bb5af41dc1..7a8b77ccaa 100644 --- a/src/soc/rockchip/rk3288/include/soc/memlayout.ld +++ b/src/soc/rockchip/rk3288/include/soc/memlayout.ld @@ -34,11 +34,11 @@ SECTIONS SRAM_START(0xFF700000) TTB(0xFF700000, 16K) - BOOTBLOCK(0xFF704004, 17K - 4) - TTB_SUBTABLES(0xFF708400, 1K) + BOOTBLOCK(0xFF704004, 18K - 4) PRERAM_CBMEM_CONSOLE(0xFF708800, 4K) VBOOT2_WORK(0xFF709800, 12K) - OVERLAP_VERSTAGE_ROMSTAGE(0xFF70C800, 42K) + OVERLAP_VERSTAGE_ROMSTAGE(0xFF70C800, 41K) + TTB_SUBTABLES(0xFF716C00, 1K) PRERAM_CBFS_CACHE(0xFF717000, 1K) STACK(0xFF717580, 3K - 0x180) SRAM_END(0xFF718000) |