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)