From 20fffa282b20fb32ce2ff687f4479be630f90fcf Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Fri, 21 Nov 2014 17:07:16 -0800 Subject: [PATCH] t132: Make non-vboot2 memlayout more useful Update non-vboot2 memlayout: 1) Add timestamp region 2) Increase ramstage size 3) Change name from memlayout_vboot.ld to memlayout.ld so that any non-vboot upstream board can also use this layout. BUG=None BRANCH=None TEST=Compiles and boots to kernel prompt on ryu with vboot selected instead of vboot2. Signed-off-by: Furquan Shaikh Change-Id: I91accd54efc53ab563a2063b9c6e9390f5dd527f Reviewed-on: https://chromium-review.googlesource.com/231547 Reviewed-by: Aaron Durbin Tested-by: Furquan Shaikh Commit-Queue: Furquan Shaikh --- src/mainboard/google/rush/memlayout.ld | 2 +- src/mainboard/google/rush_ryu/memlayout.ld | 2 +- .../include/soc/{memlayout_vboot.ld => memlayout.ld} | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) rename src/soc/nvidia/tegra132/include/soc/{memlayout_vboot.ld => memlayout.ld} (87%) diff --git a/src/mainboard/google/rush/memlayout.ld b/src/mainboard/google/rush/memlayout.ld index 57a37c06b2..a71dcb8508 100644 --- a/src/mainboard/google/rush/memlayout.ld +++ b/src/mainboard/google/rush/memlayout.ld @@ -1,6 +1,6 @@ #if IS_ENABLED(CONFIG_VBOOT2_VERIFY_FIRMWARE) #include #else -#include +#include #endif diff --git a/src/mainboard/google/rush_ryu/memlayout.ld b/src/mainboard/google/rush_ryu/memlayout.ld index 5bd72e5126..d8fdb9a94b 100644 --- a/src/mainboard/google/rush_ryu/memlayout.ld +++ b/src/mainboard/google/rush_ryu/memlayout.ld @@ -1,5 +1,5 @@ #if IS_ENABLED(CONFIG_VBOOT2_VERIFY_FIRMWARE) #include #else -#include +#include #endif diff --git a/src/soc/nvidia/tegra132/include/soc/memlayout_vboot.ld b/src/soc/nvidia/tegra132/include/soc/memlayout.ld similarity index 87% rename from src/soc/nvidia/tegra132/include/soc/memlayout_vboot.ld rename to src/soc/nvidia/tegra132/include/soc/memlayout.ld index c097c3cd6a..28f8d59592 100644 --- a/src/soc/nvidia/tegra132/include/soc/memlayout_vboot.ld +++ b/src/soc/nvidia/tegra132/include/soc/memlayout.ld @@ -32,12 +32,14 @@ SECTIONS { SRAM_START(0x40000000) PRERAM_CBMEM_CONSOLE(0x40000000, 8K) - CBFS_CACHE(0x40002000, 88K) - STACK(0x40018000, 16K) - BOOTBLOCK(0x4001C000, 20K) + PRERAM_CBFS_CACHE(0x40002000, 84K) + STACK(0x40017000, 16K) + TIMESTAMP(0x4001B000, 2K) + BOOTBLOCK(0x4001B800, 22K) ROMSTAGE(0x40021000, 124K) SRAM_END(0x40040000) DRAM_START(0x80000000) - RAMSTAGE(0x80200000, 192K) + POSTRAM_CBFS_CACHE(0x80100000, 1M) + RAMSTAGE(0x80200000, 256K) }