From 4d644b3dd9af5c76a27d72d256c1f04024921690 Mon Sep 17 00:00:00 2001 From: Julius Werner Date: Fri, 19 Dec 2014 12:41:16 -0800 Subject: [PATCH] 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: Id2f1204c30aa28251cf85cb80d7ca44947388dba Signed-off-by: Julius Werner Reviewed-on: https://chromium-review.googlesource.com/236977 Reviewed-by: David Hendricks (cherry picked from commit 8769e5a34ad3cd417132646fbb58ff51c29fb640) Signed-off-by: Julius Werner Reviewed-on: https://chromium-review.googlesource.com/237203 --- src/mainboard/google/veyron_jerry/Kconfig | 1 + src/mainboard/google/veyron_mighty/Kconfig | 1 + src/mainboard/google/veyron_pinky/Kconfig | 1 + src/mainboard/google/veyron_speedy/Kconfig | 1 + 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 904d6c29b0..e3e1a50137 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 d4b7dc3fc9..86de8521f7 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 d290c23114..1740e4cd76 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 94232ebe52..a29736e5d3 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 805aff0252..d0073b1807 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) TIMESTAMP(0xFF717400, 0x180) STACK(0xFF717580, 3K - 0x180)