summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2014-11-21 17:07:16 -0800
committerPatrick Georgi <pgeorgi@google.com>2015-04-10 20:46:58 +0200
commit49aa78adbaa23ae2078751d3e4e0eff7d8c9f132 (patch)
treef1835a71697a2b9283aea075df38a20b6f08e4e5
parentd56abd7d7a9b3b760dc6622858156474f689f1ef (diff)
downloadcoreboot-49aa78adbaa23ae2078751d3e4e0eff7d8c9f132.tar.xz
tegra132: 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. Change-Id: Idced98f9df7cdbab5f62cd1e382c6046ade1d867 Signed-off-by: Patrick Georgi <pgeorgi@chromium.org> Original-Commit-Id: 20fffa282b20fb32ce2ff687f4479be630f90fcf Original-Signed-off-by: Furquan Shaikh <furquan@google.com> Original-Change-Id: I91accd54efc53ab563a2063b9c6e9390f5dd527f Original-Reviewed-on: https://chromium-review.googlesource.com/231547 Original-Reviewed-by: Aaron Durbin <adurbin@chromium.org> Original-Tested-by: Furquan Shaikh <furquan@chromium.org> Original-Commit-Queue: Furquan Shaikh <furquan@chromium.org> Reviewed-on: http://review.coreboot.org/9536 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rw-r--r--src/mainboard/google/rush/memlayout.ld2
-rw-r--r--src/mainboard/google/rush_ryu/memlayout.ld2
-rw-r--r--src/soc/nvidia/tegra132/include/soc/memlayout.ld (renamed from src/soc/nvidia/tegra132/include/soc/memlayout_vboot.ld)9
3 files changed, 7 insertions, 6 deletions
diff --git a/src/mainboard/google/rush/memlayout.ld b/src/mainboard/google/rush/memlayout.ld
index 5bd72e5126..d8fdb9a94b 100644
--- a/src/mainboard/google/rush/memlayout.ld
+++ b/src/mainboard/google/rush/memlayout.ld
@@ -1,5 +1,5 @@
#if IS_ENABLED(CONFIG_VBOOT2_VERIFY_FIRMWARE)
#include <soc/memlayout_vboot2.ld>
#else
-#include <soc/memlayout_vboot.ld>
+#include <soc/memlayout.ld>
#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 <soc/memlayout_vboot2.ld>
#else
-#include <soc/memlayout_vboot.ld>
+#include <soc/memlayout.ld>
#endif
diff --git a/src/soc/nvidia/tegra132/include/soc/memlayout_vboot.ld b/src/soc/nvidia/tegra132/include/soc/memlayout.ld
index c097c3cd6a..a7e3635c87 100644
--- a/src/soc/nvidia/tegra132/include/soc/memlayout_vboot.ld
+++ b/src/soc/nvidia/tegra132/include/soc/memlayout.ld
@@ -32,12 +32,13 @@ 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)
+ BOOTBLOCK(0x4001B800, 22K)
ROMSTAGE(0x40021000, 124K)
SRAM_END(0x40040000)
DRAM_START(0x80000000)
- RAMSTAGE(0x80200000, 192K)
+ POSTRAM_CBFS_CACHE(0x80100000, 1M)
+ RAMSTAGE(0x80200000, 256K)
}