From 7329f55d8f7a025af623ad9cb30ab37694295653 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 6 Jun 2012 14:48:23 +0200 Subject: bsps/arm: Rename linkcmds.armv7 to linkcmds.armv7m --- c/src/lib/libbsp/arm/Makefile.am | 2 +- .../libbsp/arm/lm3s69xx/startup/linkcmds.lm3s6965 | 2 +- .../arm/lpc24xx/startup/linkcmds.lpc17xx_ea_ram | 2 +- .../lpc24xx/startup/linkcmds.lpc17xx_ea_rom_int | 2 +- c/src/lib/libbsp/arm/preinstall.am | 6 ++--- c/src/lib/libbsp/arm/shared/startup/linkcmds.armv7 | 26 ---------------------- .../lib/libbsp/arm/shared/startup/linkcmds.armv7m | 26 ++++++++++++++++++++++ .../libbsp/arm/stm32f4/startup/linkcmds.stm32f4 | 2 +- 8 files changed, 34 insertions(+), 34 deletions(-) delete mode 100644 c/src/lib/libbsp/arm/shared/startup/linkcmds.armv7 create mode 100644 c/src/lib/libbsp/arm/shared/startup/linkcmds.armv7m diff --git a/c/src/lib/libbsp/arm/Makefile.am b/c/src/lib/libbsp/arm/Makefile.am index b1cdd113e3..9783354c98 100644 --- a/c/src/lib/libbsp/arm/Makefile.am +++ b/c/src/lib/libbsp/arm/Makefile.am @@ -10,7 +10,7 @@ include_bsp_HEADERS = shared/include/linker-symbols.h dist_project_lib_DATA = shared/startup/linkcmds.base dist_project_lib_DATA += shared/startup/linkcmds.armv4 -dist_project_lib_DATA += shared/startup/linkcmds.armv7 +dist_project_lib_DATA += shared/startup/linkcmds.armv7m EXTRA_DIST = diff --git a/c/src/lib/libbsp/arm/lm3s69xx/startup/linkcmds.lm3s6965 b/c/src/lib/libbsp/arm/lm3s69xx/startup/linkcmds.lm3s6965 index b3de8257d6..72c06a8c7c 100644 --- a/c/src/lib/libbsp/arm/lm3s69xx/startup/linkcmds.lm3s6965 +++ b/c/src/lib/libbsp/arm/lm3s69xx/startup/linkcmds.lm3s6965 @@ -25,4 +25,4 @@ REGION_ALIAS ("REGION_BSS", RAM_INT); REGION_ALIAS ("REGION_WORK", RAM_INT); REGION_ALIAS ("REGION_STACK", RAM_INT); -INCLUDE linkcmds.armv7 +INCLUDE linkcmds.armv7m diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_ea_ram b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_ea_ram index 88aaef7aed..79065bb2a7 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_ea_ram +++ b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_ea_ram @@ -22,4 +22,4 @@ REGION_ALIAS ("REGION_BSS", RAM_EXT); REGION_ALIAS ("REGION_WORK", RAM_EXT); REGION_ALIAS ("REGION_STACK", RAM_INT); -INCLUDE linkcmds.armv7 +INCLUDE linkcmds.armv7m diff --git a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_ea_rom_int b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_ea_rom_int index 5fa6a800d4..343ef406a1 100644 --- a/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_ea_rom_int +++ b/c/src/lib/libbsp/arm/lpc24xx/startup/linkcmds.lpc17xx_ea_rom_int @@ -22,4 +22,4 @@ REGION_ALIAS ("REGION_BSS", RAM_INT); REGION_ALIAS ("REGION_WORK", RAM_INT); REGION_ALIAS ("REGION_STACK", RAM_INT); -INCLUDE linkcmds.armv7 +INCLUDE linkcmds.armv7m diff --git a/c/src/lib/libbsp/arm/preinstall.am b/c/src/lib/libbsp/arm/preinstall.am index b6959d52f1..3e66ebea32 100644 --- a/c/src/lib/libbsp/arm/preinstall.am +++ b/c/src/lib/libbsp/arm/preinstall.am @@ -35,7 +35,7 @@ $(PROJECT_LIB)/linkcmds.armv4: shared/startup/linkcmds.armv4 $(PROJECT_LIB)/$(di $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.armv4 PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.armv4 -$(PROJECT_LIB)/linkcmds.armv7: shared/startup/linkcmds.armv7 $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.armv7 -PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.armv7 +$(PROJECT_LIB)/linkcmds.armv7m: shared/startup/linkcmds.armv7m $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.armv7m +PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.armv7m diff --git a/c/src/lib/libbsp/arm/shared/startup/linkcmds.armv7 b/c/src/lib/libbsp/arm/shared/startup/linkcmds.armv7 deleted file mode 100644 index ecdb55a184..0000000000 --- a/c/src/lib/libbsp/arm/shared/startup/linkcmds.armv7 +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @file - * - * @ingroup bsp_linker - * - * @brief Linker command file for ARMv7 architecture. - */ - -/* - * Copyright (c) 2010 embedded brains GmbH. All rights reserved. - * - * embedded brains GmbH - * Obere Lagerstr. 30 - * 82178 Puchheim - * Germany - * - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - */ - -bsp_stack_main_size = DEFINED (bsp_stack_main_size) ? bsp_stack_main_size : 4096; -bsp_stack_main_size = ALIGN (bsp_stack_main_size, bsp_stack_align); - -INCLUDE linkcmds.base diff --git a/c/src/lib/libbsp/arm/shared/startup/linkcmds.armv7m b/c/src/lib/libbsp/arm/shared/startup/linkcmds.armv7m new file mode 100644 index 0000000000..ecdb55a184 --- /dev/null +++ b/c/src/lib/libbsp/arm/shared/startup/linkcmds.armv7m @@ -0,0 +1,26 @@ +/** + * @file + * + * @ingroup bsp_linker + * + * @brief Linker command file for ARMv7 architecture. + */ + +/* + * Copyright (c) 2010 embedded brains GmbH. All rights reserved. + * + * embedded brains GmbH + * Obere Lagerstr. 30 + * 82178 Puchheim + * Germany + * + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + */ + +bsp_stack_main_size = DEFINED (bsp_stack_main_size) ? bsp_stack_main_size : 4096; +bsp_stack_main_size = ALIGN (bsp_stack_main_size, bsp_stack_align); + +INCLUDE linkcmds.base diff --git a/c/src/lib/libbsp/arm/stm32f4/startup/linkcmds.stm32f4 b/c/src/lib/libbsp/arm/stm32f4/startup/linkcmds.stm32f4 index a68846ec39..82195056b3 100644 --- a/c/src/lib/libbsp/arm/stm32f4/startup/linkcmds.stm32f4 +++ b/c/src/lib/libbsp/arm/stm32f4/startup/linkcmds.stm32f4 @@ -19,4 +19,4 @@ REGION_ALIAS ("REGION_BSS", RAM_INT); REGION_ALIAS ("REGION_WORK", RAM_INT); REGION_ALIAS ("REGION_STACK", RAM_INT); -INCLUDE linkcmds.armv7 +INCLUDE linkcmds.armv7m -- cgit v1.2.3