From 2bf949abd40425a00dc331f1a0a85c7bee172f63 Mon Sep 17 00:00:00 2001
From: Jonas Blixt <jonpe960@gmail.com>
Date: Tue, 18 Apr 2023 09:27:52 +0200
Subject: [PATCH] link: Put back the 'buffer' segment

This is needed for compatibility reasons. In the future the buffer
location should perhaps be configurable through Kconfig.
---
 src/link.lds             | 2 +-
 src/plat/imx6ul/link.lds | 3 ++-
 src/plat/imx8x/link.lds  | 1 +
 src/plat/qemu/link.lds   | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/link.lds b/src/link.lds
index 812ff088..1f5f27a1 100644
--- a/src/link.lds
+++ b/src/link.lds
@@ -80,7 +80,7 @@ SECTIONS
         *(xlat_table)
         . = ALIGN(4096);
         PROVIDE(_no_init_end = .);
-    } > ram
+    } > buffers
 
     PROVIDE(end = .);
 }
diff --git a/src/plat/imx6ul/link.lds b/src/plat/imx6ul/link.lds
index 6c95aeac..df8711e3 100644
--- a/src/plat/imx6ul/link.lds
+++ b/src/plat/imx6ul/link.lds
@@ -15,5 +15,6 @@
 
 MEMORY
 {
-    ram (rx)  : ORIGIN = 0x80001000, LENGTH = 16M
+    ram (rx)  : ORIGIN = 0x80001000, LENGTH = 1M
+    buffers (rx)  : ORIGIN = 0x81021000, LENGTH = 16M
 }
diff --git a/src/plat/imx8x/link.lds b/src/plat/imx8x/link.lds
index 27967b1f..cff894df 100644
--- a/src/plat/imx8x/link.lds
+++ b/src/plat/imx8x/link.lds
@@ -11,6 +11,7 @@ MEMORY
 {
     reset(rx) : ORIGIN = 0x80000000, LENGTH = 128K
     ram (rx)  : ORIGIN = 0x80020000, LENGTH = 16M
+    buffers (rx)  : ORIGIN = 0x85000000, LENGTH = 16M
 }
 
 /**
diff --git a/src/plat/qemu/link.lds b/src/plat/qemu/link.lds
index 978f1217..f823b46a 100644
--- a/src/plat/qemu/link.lds
+++ b/src/plat/qemu/link.lds
@@ -12,6 +12,7 @@
 MEMORY
 {
     ram (rx)  : ORIGIN = 0x40000000, LENGTH = 32M
+    buffers (rx)  : ORIGIN = 0x41100000, LENGTH = 16M
 }