Changeset bc820946 in rtems

Timestamp:

10/08/15 11:29:56 (7 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

cf8e033

Parents:

707ecbe

git-author:

Sebastian Huber <sebastian.huber@…> (10/08/15 11:29:56)

git-committer:

Sebastian Huber <sebastian.huber@…> (10/08/15 11:34:40)

Message:

bsps: Add .nocacheheap section

This avoids consumption of a loadable address space for the nocache
heap.

Location:

c/src/lib/libbsp

Files:

• arm/altera-cyclone-v/startup/bspstart.c (modified) (2 diffs)
• arm/shared/include/linker-symbols.h (modified) (3 diffs)
• arm/shared/startup/linkcmds.base (modified) (2 diffs)
• arm/xilinx-zynq/startup/bspstart.c (modified) (2 diffs)
• powerpc/shared/include/linker-symbols.h (modified) (2 diffs)
• powerpc/shared/startup/linkcmds.base (modified) (2 diffs)

c/src/lib/libbsp/arm/altera-cyclone-v/startup/bspstart.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2013-2014 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2013-2015 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
@@ -23 +23 @@
   bsp_interrupt_initialize();
   rtems_cache_coherent_add_area(
-    bsp_nocache_heap_begin,
-    (uintptr_t) bsp_nocache_heap_size
+    bsp_section_nocacheheap_begin,
+    (uintptr_t) bsp_section_nocacheheap_size
   );
 }

c/src/lib/libbsp/arm/shared/include/linker-symbols.h

@@ -8 +8 @@
 
 /*
- * Copyright (c) 2008-2014 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2008-2015 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
@@ -120 +120 @@
 LINKER_SYMBOL(bsp_section_nocache_load_end)
 
+LINKER_SYMBOL(bsp_section_nocacheheap_begin)
+LINKER_SYMBOL(bsp_section_nocacheheap_end)
+LINKER_SYMBOL(bsp_section_nocacheheap_size)
+
 LINKER_SYMBOL(bsp_vector_table_begin)
 LINKER_SYMBOL(bsp_vector_table_end)
@@ -130 +134 @@
 LINKER_SYMBOL(bsp_translation_table_base)
 LINKER_SYMBOL(bsp_translation_table_end)
-
-LINKER_SYMBOL(bsp_nocache_heap_begin)
-LINKER_SYMBOL(bsp_nocache_heap_end)
-LINKER_SYMBOL(bsp_nocache_heap_size)
 
 #define BSP_FAST_TEXT_SECTION __attribute__((section(".bsp_fast_text")))

c/src/lib/libbsp/arm/shared/startup/linkcmds.base

@@ -8 +8 @@
 
 /*
- * Copyright (c) 2008-2014 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2008-2015 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
- *  Obere Lagerstr. 30
+ *  Dornierstr. 4
  *  82178 Puchheim
  *  Germany
@@ -401 +401 @@
                 bsp_section_nocache_begin = .;
                 *(SORT(.bsp_nocache*))
-                bsp_nocache_heap_begin = .;
-                . += ORIGIN (REGION_NOCACHE) + LENGTH (REGION_NOCACHE) - ABSOLUTE (.);
-                bsp_nocache_heap_end = .;
                 bsp_section_nocache_end = .;
         } > REGION_NOCACHE AT > REGION_NOCACHE_LOAD
-        bsp_nocache_heap_size = bsp_nocache_heap_end - bsp_nocache_heap_begin;
         bsp_section_nocache_size = bsp_section_nocache_end - bsp_section_nocache_begin;
         bsp_section_nocache_load_begin = LOADADDR (.nocache);
         bsp_section_nocache_load_end = bsp_section_nocache_load_begin + bsp_section_nocache_size;
+
+        .nocacheheap (NOLOAD) : ALIGN_WITH_INPUT {
+                bsp_section_nocacheheap_begin = .;
+                . += ORIGIN (REGION_NOCACHE) + LENGTH (REGION_NOCACHE) - ABSOLUTE (.);
+                bsp_section_nocacheheap_end = .;
+        } > REGION_NOCACHE AT > REGION_NOCACHE
+        bsp_section_nocacheheap_size = bsp_section_nocacheheap_end - bsp_section_nocacheheap_begin;
 
         /* FIXME */

c/src/lib/libbsp/arm/xilinx-zynq/startup/bspstart.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2013-2014 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2013-2015 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
@@ -29 +29 @@
   bsp_interrupt_initialize();
   rtems_cache_coherent_add_area(
-    bsp_nocache_heap_begin,
-    (uintptr_t) bsp_nocache_heap_size
+    bsp_section_nocacheheap_begin,
+    (uintptr_t) bsp_section_nocacheheap_size
   );
 }

c/src/lib/libbsp/powerpc/shared/include/linker-symbols.h

@@ -8 +8 @@
 
 /*
- * Copyright (c) 2010-2013 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2010-2015 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
- *  Donrierstr. 4
+ *  Dornierstr. 4
  *  82178 Puchheim
  *  Germany
@@ -100 +100 @@
 LINKER_SYMBOL(bsp_section_nocache_load_end)
 
+LINKER_SYMBOL(bsp_section_nocacheheap_begin)
+LINKER_SYMBOL(bsp_section_nocacheheap_end)
+LINKER_SYMBOL(bsp_section_nocacheheap_size)
+
 LINKER_SYMBOL(bsp_section_nvram_begin)
 LINKER_SYMBOL(bsp_section_nvram_end)

c/src/lib/libbsp/powerpc/shared/startup/linkcmds.base

@@ -8 +8 @@
 
 /*
- * Copyright (c) 2011-2013 embedded brains GmbH.  All rights reserved.
+ * Copyright (c) 2011-2015 embedded brains GmbH.  All rights reserved.
  *
  *  embedded brains GmbH
- *  Obere Lagerstr. 30
+ *  Dornierstr. 4
  *  82178 Puchheim
  *  Germany
@@ -343 +343 @@
         bsp_section_nocache_load_end = bsp_section_nocache_load_begin + bsp_section_nocache_size;
 
+        .nocacheheap (NOLOAD) : ALIGN_WITH_INPUT {
+                bsp_section_nocacheheap_begin = .;
+                . += ORIGIN (REGION_NOCACHE) + LENGTH (REGION_NOCACHE) - ABSOLUTE (.);
+                bsp_section_nocacheheap_end = .;
+        } > REGION_NOCACHE AT > REGION_NOCACHE
+        bsp_section_nocacheheap_size = bsp_section_nocacheheap_end - bsp_section_nocacheheap_begin;
+
         .nvram (NOLOAD) : ALIGN_WITH_INPUT {
                 bsp_section_nvram_begin = .;
                 *(SORT(.bsp_nvram*))
                 bsp_section_nvram_end = .;
-        } > REGION_NVRAM
+        } > REGION_NVRAM AT > REGION_NVRAM
         bsp_section_nvram_size = bsp_section_nvram_end - bsp_section_nvram_begin;