From 29309f101a4828842c377ff11a3a59908aab05f2 Mon Sep 17 00:00:00 2001
From: edolomb <none@example.com>
Date: Thu, 17 Jan 2019 15:19:20 +0000
Subject: Updated SAMA drivers (still incomplete)

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12543 110e8d01-0319-4d1e-a829-52ad28d1bb01
---
 .../startup/ARM/compilers/GCC/ld/SAMA5D2bvddr.ld   | 46 ----------------------
 .../startup/ARM/compilers/GCC/ld/SAMA5D2ddr.ld     | 39 ++++++++++++++++--
 2 files changed, 35 insertions(+), 50 deletions(-)
 delete mode 100755 os/common/startup/ARM/compilers/GCC/ld/SAMA5D2bvddr.ld

(limited to 'os/common/startup/ARM/compilers')

diff --git a/os/common/startup/ARM/compilers/GCC/ld/SAMA5D2bvddr.ld b/os/common/startup/ARM/compilers/GCC/ld/SAMA5D2bvddr.ld
deleted file mode 100755
index efa2f63d9..000000000
--- a/os/common/startup/ARM/compilers/GCC/ld/SAMA5D2bvddr.ld
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-/*
- * SAMA5D2 memory setup in non trusted mode.
- */
-MEMORY
-{
-    flash : org = 0x21000000, len = 16M
-    ram0  : org = 0x22000000, len = 96M
-    ram1  : org = 0x00000000, len = 0
-    ram2  : org = 0x00000000, len = 0
-    ram3  : org = 0x00000000, len = 0
-    ram4  : org = 0x00000000, len = 0
-    ram5  : org = 0x00000000, len = 0
-    ram6  : org = 0x00000000, len = 0
-    ram7  : org = 0x00000000, len = 0
-}
-
-/* RAM region to be used for stacks. This stack accommodates the processing
-   of all exceptions and interrupts*/
-REGION_ALIAS("STACKS_RAM", ram0);
-
-/* RAM region to be used for data segment.*/
-REGION_ALIAS("DATA_RAM", ram0);
-
-/* RAM region to be used for BSS segment.*/
-REGION_ALIAS("BSS_RAM", ram0);
-
-INCLUDE rules.ld
-
-ENTRY(Boot_Handler);
-
diff --git a/os/common/startup/ARM/compilers/GCC/ld/SAMA5D2ddr.ld b/os/common/startup/ARM/compilers/GCC/ld/SAMA5D2ddr.ld
index e2bcb004a..087234cbf 100755
--- a/os/common/startup/ARM/compilers/GCC/ld/SAMA5D2ddr.ld
+++ b/os/common/startup/ARM/compilers/GCC/ld/SAMA5D2ddr.ld
@@ -19,10 +19,10 @@
  */
 MEMORY
 {
-    flash : org = 0x20000000, len = 16M
-    ram0  : org = 0x21000000, len = 96M
-    ram1  : org = 0x00000000, len = 0
-    ram2  : org = 0x00000000, len = 0
+    flash : org = 0x21000000, len = 16M
+    ram0  : org = 0x22000000, len = 78M
+    ram1  : org = 0x26E00000, len = 1M
+    ram2  : org = 0x26F00000, len = 1M
     ram3  : org = 0x00000000, len = 0
     ram4  : org = 0x00000000, len = 0
     ram5  : org = 0x00000000, len = 0
@@ -40,6 +40,37 @@ REGION_ALIAS("DATA_RAM", ram0);
 /* RAM region to be used for BSS segment.*/
 REGION_ALIAS("BSS_RAM", ram0);
 
+/* RAM region to be used for lcd frame buffer. */
+REGION_ALIAS("FB_RAM", ram1);
+
+/* RAM region to be used for no cache area. */
+REGION_ALIAS("NO_CACHE", ram2);
+
+SECTIONS
+{
+    /* Special section for frame buffer area.*/
+    .fbram (NOLOAD) : ALIGN(4)
+    {
+        __fbram_base__ = .;
+        *(.fbram)
+        *(.fbram.*)
+        *(.bss.__fbram_*)
+        . = ALIGN(4);
+        __fbram_end__ = .;
+    } > FB_RAM
+    
+    /* Special section for no cache area.*/
+    .nocache (NOLOAD) : ALIGN(4)
+    {
+        __nocache_base__ = .;
+        *(.nocache)
+        *(.nocache.*)
+        *(.bss.__nocache_*)
+        . = ALIGN(4);
+        __nocache_end__ = .;
+    } > NO_CACHE
+}
+
 INCLUDE rules.ld
 
 ENTRY(Boot_Handler);
-- 
cgit v1.2.3