summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2019-12-21 07:35:35 +0800
committerGitHub <[email protected]>2019-12-21 07:35:35 +0800
commitdf933cf8c7bbefa1355f14e1905f7073a7b93e2b (patch)
tree9e056144360c32c9bfff9d5e0ec5af52e4665ee8
parent64945ba882d651a14933eb4e7b3d93d10d6daae1 (diff)
parent15ceaad6e4d381b521d2cc623419f6974ab72a40 (diff)
Merge pull request #3283 from a1012112796/writing/correct_ram_config
[BSP/stm32f427-robomaster-a] Correct RAM configuration information
-rw-r--r--bsp/stm32/stm32f427-robomaster-a/README.md2
-rw-r--r--bsp/stm32/stm32f427-robomaster-a/board/board.h2
-rw-r--r--bsp/stm32/stm32f427-robomaster-a/board/linker_scripts/link.icf6
-rw-r--r--bsp/stm32/stm32f427-robomaster-a/board/linker_scripts/link.lds9
-rw-r--r--bsp/stm32/stm32f427-robomaster-a/board/linker_scripts/link.sct6
5 files changed, 15 insertions, 10 deletions
diff --git a/bsp/stm32/stm32f427-robomaster-a/README.md b/bsp/stm32/stm32f427-robomaster-a/README.md
index 9b288d5048..bba5febd73 100644
--- a/bsp/stm32/stm32f427-robomaster-a/README.md
+++ b/bsp/stm32/stm32f427-robomaster-a/README.md
@@ -22,7 +22,7 @@ RoboMaster开发板套件是一款面向机器人DIY的开源主控套件。开�
该开发板常用 **板载资源** 如下:
-- MCU:STM32f427IIH6,主频 180MHz,2048KB FLASH ,128KB RAM
+- MCU:STM32f427IIH6,主频 180MHz,2048KB FLASH ,256KB RAM(含64KB CCM RAM未使用)
- 常用外设
- LED:2个,D10(红色,PE11),D9(绿色,PE14)
- 按键:1个,KEY(PB2)
diff --git a/bsp/stm32/stm32f427-robomaster-a/board/board.h b/bsp/stm32/stm32f427-robomaster-a/board/board.h
index 57c8e4a954..4c74f95682 100644
--- a/bsp/stm32/stm32f427-robomaster-a/board/board.h
+++ b/bsp/stm32/stm32f427-robomaster-a/board/board.h
@@ -25,7 +25,7 @@ extern "C" {
#define STM32_FLASH_SIZE (2048 * 1024)
#define STM32_FLASH_END_ADDRESS ((uint32_t)(STM32_FLASH_START_ADRESS + STM32_FLASH_SIZE))
-#define STM32_SRAM1_SIZE (128)
+#define STM32_SRAM1_SIZE (192)
#define STM32_SRAM1_START (0x20000000)
#define STM32_SRAM1_END (STM32_SRAM1_START + STM32_SRAM1_SIZE * 1024)
diff --git a/bsp/stm32/stm32f427-robomaster-a/board/linker_scripts/link.icf b/bsp/stm32/stm32f427-robomaster-a/board/linker_scripts/link.icf
index a481a85ff3..03094ef488 100644
--- a/bsp/stm32/stm32f427-robomaster-a/board/linker_scripts/link.icf
+++ b/bsp/stm32/stm32f427-robomaster-a/board/linker_scripts/link.icf
@@ -6,8 +6,10 @@ define symbol __ICFEDIT_intvec_start__ = 0x08000000;
/*-Memory Regions-*/
define symbol __ICFEDIT_region_ROM_start__ = 0x08000000;
define symbol __ICFEDIT_region_ROM_end__ = 0x081FFFFF;
-define symbol __ICFEDIT_region_RAM_start__ = 0x20000000;
-define symbol __ICFEDIT_region_RAM_end__ = 0x2001FFFF;
+define symbol __ICFEDIT_region_RAM1_start__ = 0x20000000;
+define symbol __ICFEDIT_region_RAM1_end__ = 0x2002FFFF;
+define symbol __ICFEDIT_region_RAM2_start__ = 0x10000000;
+define symbol __ICFEDIT_region_RAM2_end__ = 0x1000FFFF;
/*-Sizes-*/
define symbol __ICFEDIT_size_cstack__ = 0x0400;
diff --git a/bsp/stm32/stm32f427-robomaster-a/board/linker_scripts/link.lds b/bsp/stm32/stm32f427-robomaster-a/board/linker_scripts/link.lds
index 9d870aef5e..739d488555 100644
--- a/bsp/stm32/stm32f427-robomaster-a/board/linker_scripts/link.lds
+++ b/bsp/stm32/stm32f427-robomaster-a/board/linker_scripts/link.lds
@@ -6,7 +6,8 @@
MEMORY
{
ROM (rx) : ORIGIN = 0x08000000, LENGTH = 2048k /* 2048KB flash */
- RAM (rw) : ORIGIN = 0x20000000, LENGTH = 128k /* 128KB sram */
+ RAM1 (rw) : ORIGIN = 0x20000000, LENGTH = 192k /* 192K sram */
+ RAM2 (rw) : ORIGIN = 0x10000000, LENGTH = 64k /* 64K sram */
}
ENTRY(Reset_Handler)
_system_stack_size = 0x200;
@@ -88,7 +89,7 @@ SECTIONS
. = ALIGN(4);
/* This is used by the startup in order to initialize the .data secion */
_edata = . ;
- } > RAM
+ } > RAM1
.stack :
{
@@ -97,7 +98,7 @@ SECTIONS
. = . + _system_stack_size;
. = ALIGN(4);
_estack = .;
- } > RAM
+ } > RAM1
__bss_start = .;
.bss :
@@ -115,7 +116,7 @@ SECTIONS
_ebss = . ;
*(.bss.init)
- } > RAM
+ } > RAM1
__bss_end = .;
_end = .;
diff --git a/bsp/stm32/stm32f427-robomaster-a/board/linker_scripts/link.sct b/bsp/stm32/stm32f427-robomaster-a/board/linker_scripts/link.sct
index b4e850d630..aca2546c3a 100644
--- a/bsp/stm32/stm32f427-robomaster-a/board/linker_scripts/link.sct
+++ b/bsp/stm32/stm32f427-robomaster-a/board/linker_scripts/link.sct
@@ -8,8 +8,10 @@ LR_IROM1 0x08000000 0x00200000 { ; load region size_region
*(InRoot$$Sections)
.ANY (+RO)
}
- RW_IRAM1 0x20000000 0x00020000 { ; RW data
+ RW_IRAM1 0x20000000 0x00030000 { ; RW data
+ .ANY (+RW +ZI)
+ }
+ RW_IRAM2 0x10000000 0x00010000 { ; RW data
.ANY (+RW +ZI)
}
}
-