update stm32 demo and testhal projects to upstream chibios

1 files changed, 56 insertions, 24 deletions

diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/STM32F429xI_SDRAM.ld b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/STM32F429xI_SDRAM.ld
index 26bed86..ae5c084 100644
--- a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/STM32F429xI_SDRAM.ld
+++ b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/STM32F429xI_SDRAM.ld
@@ -1,20 +1,17 @@
 /*

-    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio.

+    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

 

-    This file is part of ChibiOS.

+    Licensed under the Apache License, Version 2.0 (the "License");

+    you may not use this file except in compliance with the License.

+    You may obtain a copy of the License at

 

-    ChibiOS is free software; you can redistribute it and/or modify

-    it under the terms of the GNU General Public License as published by

-    the Free Software Foundation; either version 3 of the License, or

-    (at your option) any later version.

+        http://www.apache.org/licenses/LICENSE-2.0

 

-    ChibiOS is distributed in the hope that it will be useful,

-    but WITHOUT ANY WARRANTY; without even the implied warranty of

-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-    GNU General Public License for more details.

-

-    You should have received a copy of the GNU General Public License

-    along with this program.  If not, see <http://www.gnu.org/licenses/>.

+    Unless required by applicable law or agreed to in writing, software

+    distributed under the License is distributed on an "AS IS" BASIS,

+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+    See the License for the specific language governing permissions and

+    limitations under the License.

 */

 

 /*

@@ -23,19 +20,52 @@
  */

 MEMORY

 {

-    flash : org = 0x08000000, len = 2M

-    ram0  : org = 0x20000000, len = 192k    /* SRAM1 + SRAM2 + SRAM3 */

-    ram1  : org = 0x20000000, len = 112k    /* SRAM1 */

-    ram2  : org = 0x2001C000, len = 16k     /* SRAM2 */

-    ram3  : org = 0x20020000, len = 64k     /* SRAM3 */

-    ram4  : org = 0x10000000, len = 64k     /* CCM SRAM */

-    ram5  : org = 0x40024000, len = 4k      /* BCKP SRAM */

-    ram6  : org = 0x00000000, len = 0

-    ram7  : org = 0xD0000000, len = 8M      /* SDRAM */

+    flash0 : org = 0x08000000, len = 2M

+    flash1  : org = 0x00000000, len = 0

+    flash2  : org = 0x00000000, len = 0

+    flash3  : org = 0x00000000, len = 0

+    flash4  : org = 0x00000000, len = 0

+    flash5  : org = 0x00000000, len = 0

+    flash6  : org = 0x00000000, len = 0

+    flash7  : org = 0x00000000, len = 0

+    ram0    : org = 0x20000000, len = 192k    /* SRAM1 + SRAM2 + SRAM3 */

+    ram1    : org = 0x20000000, len = 112k    /* SRAM1 */

+    ram2    : org = 0x2001C000, len = 16k     /* SRAM2 */

+    ram3    : org = 0x20020000, len = 64k     /* SRAM3 */

+    ram4    : org = 0x10000000, len = 64k     /* CCM SRAM */

+    ram5    : org = 0x40024000, len = 4k      /* BCKP SRAM */

+    ram6    : org = 0x00000000, len = 0

+    ram7    : org = 0xD0000000, len = 8M      /* SDRAM */

 }

 

+/* For each data/text section two region are defined, a virtual region

+   and a load region (_LMA suffix).*/

+

+/* Flash region to be used for exception vectors.*/

+REGION_ALIAS("VECTORS_FLASH", flash0);

+REGION_ALIAS("VECTORS_FLASH_LMA", flash0);

+

+/* Flash region to be used for constructors and destructors.*/

+REGION_ALIAS("XTORS_FLASH", flash0);

+REGION_ALIAS("XTORS_FLASH_LMA", flash0);

+

+/* Flash region to be used for code text.*/

+REGION_ALIAS("TEXT_FLASH", flash0);

+REGION_ALIAS("TEXT_FLASH_LMA", flash0);

+

+/* Flash region to be used for read only data.*/

+REGION_ALIAS("RODATA_FLASH", flash0);

+REGION_ALIAS("RODATA_FLASH_LMA", flash0);

+

+/* Flash region to be used for various.*/

+REGION_ALIAS("VARIOUS_FLASH", flash0);

+REGION_ALIAS("VARIOUS_FLASH_LMA", flash0);

+

+/* Flash region to be used for RAM(n) initialization data.*/

+REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0);

+

 /* RAM region to be used for Main stack. This stack accommodates the processing

-   of all exceptions and interrupts*/

+   of all exceptions and interrupts.*/

 REGION_ALIAS("MAIN_STACK_RAM", ram0);

 

 /* RAM region to be used for the process stack. This is the stack used by

@@ -44,14 +74,16 @@ REGION_ALIAS("PROCESS_STACK_RAM", ram0);
 

 /* RAM region to be used for data segment.*/

 REGION_ALIAS("DATA_RAM", ram0);

+REGION_ALIAS("DATA_RAM_LMA", flash0);

 

 /* RAM region to be used for BSS segment.*/

 REGION_ALIAS("BSS_RAM", ram0);

 

-/* RAM region to be used for BSS segment.*/

+/* RAM region to be used for the default heap.*/

 REGION_ALIAS("HEAP_RAM", ram0);

 

 /* RAM region to be used for SDRAM segment.*/

 REGION_ALIAS("SDRAM_RAM", ram7);

 

+/* Generic rules inclusion.*/

 INCLUDE rules.ld