From dfbedf366db952f42bfbe59c131550aed141cbe8 Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Thu, 1 Sep 2016 21:40:09 +0200 Subject: arm/raspberrypi: rename linkcmds to linkcmds.in to allow their configure processing. --- c/src/lib/libbsp/arm/raspberrypi/Makefile.am | 2 - c/src/lib/libbsp/arm/raspberrypi/configure.ac | 5 +- c/src/lib/libbsp/arm/raspberrypi/startup/linkcmds | 68 ---------------------- .../lib/libbsp/arm/raspberrypi/startup/linkcmds.in | 68 ++++++++++++++++++++++ 4 files changed, 71 insertions(+), 72 deletions(-) delete mode 100644 c/src/lib/libbsp/arm/raspberrypi/startup/linkcmds create mode 100644 c/src/lib/libbsp/arm/raspberrypi/startup/linkcmds.in diff --git a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am index 4b111ad786..01f4ad226d 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/Makefile.am +++ b/c/src/lib/libbsp/arm/raspberrypi/Makefile.am @@ -70,8 +70,6 @@ project_lib_DATA = start.$(OBJEXT) project_lib_DATA += startup/linkcmds project_lib_DATA += ../shared/startup/linkcmds.base -EXTRA_DIST = startup/linkcmds - ############################################################################### # LibBSP # ############################################################################### diff --git a/c/src/lib/libbsp/arm/raspberrypi/configure.ac b/c/src/lib/libbsp/arm/raspberrypi/configure.ac index ecaee3de6a..48bd62cbf4 100644 --- a/c/src/lib/libbsp/arm/raspberrypi/configure.ac +++ b/c/src/lib/libbsp/arm/raspberrypi/configure.ac @@ -41,7 +41,8 @@ RTEMS_BSPOPTS_HELP([BSP_IS_RPI2],[Set if the BSP variant is Raspberry Pi 2.]) AM_CONDITIONAL(RTEMS_RPI2,[test "$BSP_IS_RPI2" = "1"]) RTEMS_BSP_CLEANUP_OPTIONS(0, 0) -RTEMS_BSP_LINKCMDS -AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([ +Makefile +startup/linkcmds]) AC_OUTPUT diff --git a/c/src/lib/libbsp/arm/raspberrypi/startup/linkcmds b/c/src/lib/libbsp/arm/raspberrypi/startup/linkcmds deleted file mode 100644 index fc72b5cfd0..0000000000 --- a/c/src/lib/libbsp/arm/raspberrypi/startup/linkcmds +++ /dev/null @@ -1,68 +0,0 @@ -/** - * @file - * - * @ingroup raspberrypi_linker - * - * @brief Memory map - */ - -/** - * @defgroup raspberrypi_linker Raspberry Pi Memory Map - * - * @ingroup bsp_linker - * - * @brief Raspberry Pi memory map. - */ - -/** - * - * - * - * - *
Region NameRegion BeginRegion Size
VECTOR_RAM0x080000008k
RAM0x80008000128M
- * - * - * - * - * - * - * - * - * - * - * - * - *
Section NameSection Runtime RegionSection Load Region
.startRAM
.vectorVECTOR_RAM
.textRAMRAM_EXT
.rodataRAMRAM_EXT
.dataRAMRAM_EXT
.fastRAMRAM_EXT
.bssRAM
.workRAM
.stackRAM
- */ - -MEMORY { - VECTOR_RAM (AIW) : ORIGIN = 0x0 , LENGTH = 16k - RAM_MMU (AIW) : ORIGIN = 0x00004000, LENGTH = 16k - RAM (AIW) : ORIGIN = 0x00008000, LENGTH = 128M - 32k -} - -REGION_ALIAS ("REGION_START", RAM); -REGION_ALIAS ("REGION_VECTOR", VECTOR_RAM); -REGION_ALIAS ("REGION_TEXT", RAM); -REGION_ALIAS ("REGION_TEXT_LOAD", RAM); -REGION_ALIAS ("REGION_RODATA", RAM); -REGION_ALIAS ("REGION_RODATA_LOAD", RAM); -REGION_ALIAS ("REGION_DATA", RAM); -REGION_ALIAS ("REGION_DATA_LOAD", RAM); -REGION_ALIAS ("REGION_FAST_TEXT", RAM); -REGION_ALIAS ("REGION_FAST_TEXT_LOAD", RAM); -REGION_ALIAS ("REGION_FAST_DATA", RAM); -REGION_ALIAS ("REGION_FAST_DATA_LOAD", RAM); -REGION_ALIAS ("REGION_BSS", RAM); -REGION_ALIAS ("REGION_WORK", RAM); -REGION_ALIAS ("REGION_STACK", RAM); -REGION_ALIAS ("REGION_NOCACHE", RAM); -REGION_ALIAS ("REGION_NOCACHE_LOAD", RAM); - -bsp_stack_irq_size = DEFINED (bsp_stack_irq_size) ? bsp_stack_irq_size : 4096; -bsp_stack_abt_size = DEFINED (bsp_stack_abt_size) ? bsp_stack_abt_size : 1024; - -bsp_section_robarrier_align = DEFINED (bsp_section_robarrier_align) ? bsp_section_robarrier_align : 1M; -bsp_translation_table_base = ORIGIN (RAM_MMU); - -INCLUDE linkcmds.armv4 diff --git a/c/src/lib/libbsp/arm/raspberrypi/startup/linkcmds.in b/c/src/lib/libbsp/arm/raspberrypi/startup/linkcmds.in new file mode 100644 index 0000000000..fc72b5cfd0 --- /dev/null +++ b/c/src/lib/libbsp/arm/raspberrypi/startup/linkcmds.in @@ -0,0 +1,68 @@ +/** + * @file + * + * @ingroup raspberrypi_linker + * + * @brief Memory map + */ + +/** + * @defgroup raspberrypi_linker Raspberry Pi Memory Map + * + * @ingroup bsp_linker + * + * @brief Raspberry Pi memory map. + */ + +/** + * + * + * + * + *
Region NameRegion BeginRegion Size
VECTOR_RAM0x080000008k
RAM0x80008000128M
+ * + * + * + * + * + * + * + * + * + * + * + * + *
Section NameSection Runtime RegionSection Load Region
.startRAM
.vectorVECTOR_RAM
.textRAMRAM_EXT
.rodataRAMRAM_EXT
.dataRAMRAM_EXT
.fastRAMRAM_EXT
.bssRAM
.workRAM
.stackRAM
+ */ + +MEMORY { + VECTOR_RAM (AIW) : ORIGIN = 0x0 , LENGTH = 16k + RAM_MMU (AIW) : ORIGIN = 0x00004000, LENGTH = 16k + RAM (AIW) : ORIGIN = 0x00008000, LENGTH = 128M - 32k +} + +REGION_ALIAS ("REGION_START", RAM); +REGION_ALIAS ("REGION_VECTOR", VECTOR_RAM); +REGION_ALIAS ("REGION_TEXT", RAM); +REGION_ALIAS ("REGION_TEXT_LOAD", RAM); +REGION_ALIAS ("REGION_RODATA", RAM); +REGION_ALIAS ("REGION_RODATA_LOAD", RAM); +REGION_ALIAS ("REGION_DATA", RAM); +REGION_ALIAS ("REGION_DATA_LOAD", RAM); +REGION_ALIAS ("REGION_FAST_TEXT", RAM); +REGION_ALIAS ("REGION_FAST_TEXT_LOAD", RAM); +REGION_ALIAS ("REGION_FAST_DATA", RAM); +REGION_ALIAS ("REGION_FAST_DATA_LOAD", RAM); +REGION_ALIAS ("REGION_BSS", RAM); +REGION_ALIAS ("REGION_WORK", RAM); +REGION_ALIAS ("REGION_STACK", RAM); +REGION_ALIAS ("REGION_NOCACHE", RAM); +REGION_ALIAS ("REGION_NOCACHE_LOAD", RAM); + +bsp_stack_irq_size = DEFINED (bsp_stack_irq_size) ? bsp_stack_irq_size : 4096; +bsp_stack_abt_size = DEFINED (bsp_stack_abt_size) ? bsp_stack_abt_size : 1024; + +bsp_section_robarrier_align = DEFINED (bsp_section_robarrier_align) ? bsp_section_robarrier_align : 1M; +bsp_translation_table_base = ORIGIN (RAM_MMU); + +INCLUDE linkcmds.armv4 -- cgit v1.2.3