summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/google/veyron_jerry/Kconfig1
-rw-r--r--src/mainboard/google/veyron_mighty/Kconfig1
-rw-r--r--src/mainboard/google/veyron_pinky/Kconfig1
-rw-r--r--src/mainboard/google/veyron_speedy/Kconfig1
-rw-r--r--src/soc/rockchip/rk3288/include/soc/memlayout.ld6
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)