From bc28b65ff45d447d645426acc34690bfe74d5e43 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Thu, 14 Nov 2019 15:02:03 +0100 Subject: bsp/beagle: Rename linker command file This BSP family uses only one linker command file. Use the standard name. Update #3818. --- bsps/arm/beagle/start/linkcmds | 48 +++++++++++++++++++++++++++++++++ bsps/arm/beagle/start/linkcmds.beagle | 48 --------------------------------- c/src/lib/libbsp/arm/beagle/Makefile.am | 1 - 3 files changed, 48 insertions(+), 49 deletions(-) create mode 100644 bsps/arm/beagle/start/linkcmds delete mode 100644 bsps/arm/beagle/start/linkcmds.beagle diff --git a/bsps/arm/beagle/start/linkcmds b/bsps/arm/beagle/start/linkcmds new file mode 100644 index 0000000000..bb4047e28e --- /dev/null +++ b/bsps/arm/beagle/start/linkcmds @@ -0,0 +1,48 @@ +/** + * @file + * + * @ingroup arm_beagle + * + * @brief Linker script for beagles. + */ + +MEMORY { + /* Beagleboards and beaglebones all + * have either 256M or 512M memory. We just + * use 256M for all. + */ + RAM : ORIGIN = 0x80000000, LENGTH = 256M - 16M - 4M + NOCACHE : ORIGIN = 0x80000000 + 256M - 16M - 4M, LENGTH = 16M + RAM_MMU : ORIGIN = 0x80000000 + 256M - 4M, LENGTH = 16k +} + +REGION_ALIAS ("REGION_START", RAM); +REGION_ALIAS ("REGION_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", NOCACHE); +REGION_ALIAS ("REGION_NOCACHE_LOAD", NOCACHE); + +bsp_stack_abt_size = DEFINED (bsp_stack_abt_size) ? bsp_stack_abt_size : 1024; + +bsp_section_rwbarrier_align = DEFINED (bsp_section_rwbarrier_align) ? bsp_section_rwbarrier_align : 1M; + +bsp_vector_table_in_start_section = 1; + +bsp_translation_table_base = ORIGIN (RAM_MMU); +bsp_translation_table_end = ORIGIN (RAM_MMU) + LENGTH (RAM_MMU); + +INCLUDE linkcmds.armv4 + +HeapSize = 1024 * 1024; diff --git a/bsps/arm/beagle/start/linkcmds.beagle b/bsps/arm/beagle/start/linkcmds.beagle deleted file mode 100644 index bb4047e28e..0000000000 --- a/bsps/arm/beagle/start/linkcmds.beagle +++ /dev/null @@ -1,48 +0,0 @@ -/** - * @file - * - * @ingroup arm_beagle - * - * @brief Linker script for beagles. - */ - -MEMORY { - /* Beagleboards and beaglebones all - * have either 256M or 512M memory. We just - * use 256M for all. - */ - RAM : ORIGIN = 0x80000000, LENGTH = 256M - 16M - 4M - NOCACHE : ORIGIN = 0x80000000 + 256M - 16M - 4M, LENGTH = 16M - RAM_MMU : ORIGIN = 0x80000000 + 256M - 4M, LENGTH = 16k -} - -REGION_ALIAS ("REGION_START", RAM); -REGION_ALIAS ("REGION_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", NOCACHE); -REGION_ALIAS ("REGION_NOCACHE_LOAD", NOCACHE); - -bsp_stack_abt_size = DEFINED (bsp_stack_abt_size) ? bsp_stack_abt_size : 1024; - -bsp_section_rwbarrier_align = DEFINED (bsp_section_rwbarrier_align) ? bsp_section_rwbarrier_align : 1M; - -bsp_vector_table_in_start_section = 1; - -bsp_translation_table_base = ORIGIN (RAM_MMU); -bsp_translation_table_end = ORIGIN (RAM_MMU) + LENGTH (RAM_MMU); - -INCLUDE linkcmds.armv4 - -HeapSize = 1024 * 1024; diff --git a/c/src/lib/libbsp/arm/beagle/Makefile.am b/c/src/lib/libbsp/arm/beagle/Makefile.am index 090168983d..e37472373c 100644 --- a/c/src/lib/libbsp/arm/beagle/Makefile.am +++ b/c/src/lib/libbsp/arm/beagle/Makefile.am @@ -25,7 +25,6 @@ start.$(OBJEXT): ../../../../../../bsps/arm/shared/start/start.S project_lib_DATA = start.$(OBJEXT) project_lib_DATA += linkcmds -dist_project_lib_DATA += ../../../../../../bsps/arm/beagle/start/linkcmds.beagle ############################################################################### # LibBSP # -- cgit v1.2.3