Skip to content

Commit 13e27c1

Browse files
rogerclarkmelbournerogerclarkmelbourne
committed
Renamed generic_stm32f103rxx and generic_stm32f103zxx to remove th e xx at the end to match changes to boards.txt
1 parent 30946d8 commit 13e27c1

35 files changed

Lines changed: 1388 additions & 1388 deletions

STM32F1/variants/generic_stm32f103rxx/board.cpp renamed to STM32F1/variants/generic_stm32f103r/board.cpp

File renamed without changes.

STM32F1/variants/generic_stm32f103rxx/board/board.h renamed to STM32F1/variants/generic_stm32f103r/board/board.h

File renamed without changes.

STM32F1/variants/generic_stm32f103rxx/ld/common.inc renamed to STM32F1/variants/generic_stm32f103r/ld/common.inc

Lines changed: 220 additions & 220 deletions
Large diffs are not rendered by default.

STM32F1/variants/generic_stm32f103zxx/ld/extra_libs.inc renamed to STM32F1/variants/generic_stm32f103r/ld/extra_libs.inc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
/*
2-
* Extra archives needed by ARM's GCC ARM Embedded arm-none-eabi-
3-
* releases (https://launchpad.net/gcc-arm-embedded/).
4-
*/
5-
6-
/* This is for the provided newlib. */
7-
GROUP(libnosys.a)
1+
/*
2+
* Extra archives needed by ARM's GCC ARM Embedded arm-none-eabi-
3+
* releases (https://launchpad.net/gcc-arm-embedded/).
4+
*/
5+
6+
/* This is for the provided newlib. */
7+
GROUP(libnosys.a)

STM32F1/variants/generic_stm32f103rxx/ld/flash.ld renamed to STM32F1/variants/generic_stm32f103r/ld/flash.ld

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
/*
2-
* libmaple linker script for "Flash" builds.
3-
*
4-
* A Flash build puts .text (and .rodata) in Flash, and
5-
* .data/.bss/heap (of course) in SRAM, but offsets the sections by
6-
* enough space to store the Maple bootloader, which lives in low
7-
* Flash and uses low memory.
8-
*/
9-
10-
/*
11-
* This pulls in the appropriate MEMORY declaration from the right
12-
* subdirectory of stm32/mem/ (the environment must call ld with the
13-
* right include directory flags to make this happen). Boards can also
14-
* use this file to use any of libmaple's memory-related hooks (like
15-
* where the heap should live).
16-
*/
17-
INCLUDE mem-flash.inc
18-
19-
/* Provide memory region aliases for common.inc */
20-
REGION_ALIAS("REGION_TEXT", rom);
21-
REGION_ALIAS("REGION_DATA", ram);
22-
REGION_ALIAS("REGION_BSS", ram);
23-
REGION_ALIAS("REGION_RODATA", rom);
24-
25-
/* Let common.inc handle the real work. */
26-
INCLUDE common.inc
1+
/*
2+
* libmaple linker script for "Flash" builds.
3+
*
4+
* A Flash build puts .text (and .rodata) in Flash, and
5+
* .data/.bss/heap (of course) in SRAM, but offsets the sections by
6+
* enough space to store the Maple bootloader, which lives in low
7+
* Flash and uses low memory.
8+
*/
9+
10+
/*
11+
* This pulls in the appropriate MEMORY declaration from the right
12+
* subdirectory of stm32/mem/ (the environment must call ld with the
13+
* right include directory flags to make this happen). Boards can also
14+
* use this file to use any of libmaple's memory-related hooks (like
15+
* where the heap should live).
16+
*/
17+
INCLUDE mem-flash.inc
18+
19+
/* Provide memory region aliases for common.inc */
20+
REGION_ALIAS("REGION_TEXT", rom);
21+
REGION_ALIAS("REGION_DATA", ram);
22+
REGION_ALIAS("REGION_BSS", ram);
23+
REGION_ALIAS("REGION_RODATA", rom);
24+
25+
/* Let common.inc handle the real work. */
26+
INCLUDE common.inc

STM32F1/variants/generic_stm32f103rxx/ld/jtag.ld renamed to STM32F1/variants/generic_stm32f103r/ld/jtag.ld

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
1-
/*
2-
* libmaple linker script for "JTAG" builds.
3-
*
4-
* A "JTAG" build puts .text (and .rodata) in Flash, and
5-
* .data/.bss/heap (of course) in SRAM, but links starting at the
6-
* Flash and SRAM starting addresses (0x08000000 and 0x20000000
7-
* respectively). This will wipe out a Maple bootloader if there's one
8-
* on the board, so only use this if you know what you're doing.
9-
*
10-
* Of course, a "JTAG" build is perfectly usable for upload over SWD,
11-
* the system memory bootloader, etc. The name is just a historical
12-
* artifact.
13-
*/
14-
15-
/*
16-
* This pulls in the appropriate MEMORY declaration from the right
17-
* subdirectory of stm32/mem/ (the environment must call ld with the
18-
* right include directory flags to make this happen). Boards can also
19-
* use this file to use any of libmaple's memory-related hooks (like
20-
* where the heap should live).
21-
*/
22-
INCLUDE mem-jtag.inc
23-
24-
/* Provide memory region aliases for common.inc */
25-
REGION_ALIAS("REGION_TEXT", rom);
26-
REGION_ALIAS("REGION_DATA", ram);
27-
REGION_ALIAS("REGION_BSS", ram);
28-
REGION_ALIAS("REGION_RODATA", rom);
29-
30-
/* Let common.inc handle the real work. */
31-
INCLUDE common.inc
1+
/*
2+
* libmaple linker script for "JTAG" builds.
3+
*
4+
* A "JTAG" build puts .text (and .rodata) in Flash, and
5+
* .data/.bss/heap (of course) in SRAM, but links starting at the
6+
* Flash and SRAM starting addresses (0x08000000 and 0x20000000
7+
* respectively). This will wipe out a Maple bootloader if there's one
8+
* on the board, so only use this if you know what you're doing.
9+
*
10+
* Of course, a "JTAG" build is perfectly usable for upload over SWD,
11+
* the system memory bootloader, etc. The name is just a historical
12+
* artifact.
13+
*/
14+
15+
/*
16+
* This pulls in the appropriate MEMORY declaration from the right
17+
* subdirectory of stm32/mem/ (the environment must call ld with the
18+
* right include directory flags to make this happen). Boards can also
19+
* use this file to use any of libmaple's memory-related hooks (like
20+
* where the heap should live).
21+
*/
22+
INCLUDE mem-jtag.inc
23+
24+
/* Provide memory region aliases for common.inc */
25+
REGION_ALIAS("REGION_TEXT", rom);
26+
REGION_ALIAS("REGION_DATA", ram);
27+
REGION_ALIAS("REGION_BSS", ram);
28+
REGION_ALIAS("REGION_RODATA", rom);
29+
30+
/* Let common.inc handle the real work. */
31+
INCLUDE common.inc

STM32F1/variants/generic_stm32f103rxx/ld/mem-flash.inc renamed to STM32F1/variants/generic_stm32f103r/ld/mem-flash.inc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
MEMORY
2-
{
3-
ram (rwx) : ORIGIN = 0x20000C00, LENGTH = 61K
4-
rom (rx) : ORIGIN = 0x08005000, LENGTH = 492K
5-
}
1+
MEMORY
2+
{
3+
ram (rwx) : ORIGIN = 0x20000C00, LENGTH = 61K
4+
rom (rx) : ORIGIN = 0x08005000, LENGTH = 492K
5+
}

STM32F1/variants/generic_stm32f103rxx/ld/mem-jtag.inc renamed to STM32F1/variants/generic_stm32f103r/ld/mem-jtag.inc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
MEMORY
2-
{
3-
ram (rwx) : ORIGIN = 0x20000000, LENGTH = 64K
4-
rom (rx) : ORIGIN = 0x08000000, LENGTH = 512K
5-
}
1+
MEMORY
2+
{
3+
ram (rwx) : ORIGIN = 0x20000000, LENGTH = 64K
4+
rom (rx) : ORIGIN = 0x08000000, LENGTH = 512K
5+
}

STM32F1/variants/generic_stm32f103rxx/ld/mem-ram.inc renamed to STM32F1/variants/generic_stm32f103r/ld/mem-ram.inc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
MEMORY
2-
{
3-
ram (rwx) : ORIGIN = 0x20000C00, LENGTH = 61K
4-
rom (rx) : ORIGIN = 0x08005000, LENGTH = 0K
1+
MEMORY
2+
{
3+
ram (rwx) : ORIGIN = 0x20000C00, LENGTH = 61K
4+
rom (rx) : ORIGIN = 0x08005000, LENGTH = 0K
55
}

STM32F1/variants/generic_stm32f103rxx/ld/ram.ld renamed to STM32F1/variants/generic_stm32f103r/ld/ram.ld

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
/*
2-
* libmaple linker script for RAM builds.
3-
*
4-
* A Flash build puts .text, .rodata, and .data/.bss/heap (of course)
5-
* in SRAM, but offsets the sections by enough space to store the
6-
* Maple bootloader, which uses low memory.
7-
*/
8-
9-
/*
10-
* This pulls in the appropriate MEMORY declaration from the right
11-
* subdirectory of stm32/mem/ (the environment must call ld with the
12-
* right include directory flags to make this happen). Boards can also
13-
* use this file to use any of libmaple's memory-related hooks (like
14-
* where the heap should live).
15-
*/
16-
INCLUDE mem-ram.inc
17-
18-
/* Provide memory region aliases for common.inc */
19-
REGION_ALIAS("REGION_TEXT", ram);
20-
REGION_ALIAS("REGION_DATA", ram);
21-
REGION_ALIAS("REGION_BSS", ram);
22-
REGION_ALIAS("REGION_RODATA", ram);
23-
24-
/* Let common.inc handle the real work. */
25-
INCLUDE common.inc
1+
/*
2+
* libmaple linker script for RAM builds.
3+
*
4+
* A Flash build puts .text, .rodata, and .data/.bss/heap (of course)
5+
* in SRAM, but offsets the sections by enough space to store the
6+
* Maple bootloader, which uses low memory.
7+
*/
8+
9+
/*
10+
* This pulls in the appropriate MEMORY declaration from the right
11+
* subdirectory of stm32/mem/ (the environment must call ld with the
12+
* right include directory flags to make this happen). Boards can also
13+
* use this file to use any of libmaple's memory-related hooks (like
14+
* where the heap should live).
15+
*/
16+
INCLUDE mem-ram.inc
17+
18+
/* Provide memory region aliases for common.inc */
19+
REGION_ALIAS("REGION_TEXT", ram);
20+
REGION_ALIAS("REGION_DATA", ram);
21+
REGION_ALIAS("REGION_BSS", ram);
22+
REGION_ALIAS("REGION_RODATA", ram);
23+
24+
/* Let common.inc handle the real work. */
25+
INCLUDE common.inc

0 commit comments

Comments
 (0)