Minor improvements in DMA2D demo

2 files changed, 59 insertions, 5 deletions

diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile
index c1fa53e..5656ad2 100644
--- a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile
+++ b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile
@@ -30,7 +30,7 @@ endif
 

 # Enable this if you want link time optimizations (LTO)

 ifeq ($(USE_LTO),)

-  USE_LTO = yes

+  USE_LTO = no

 endif

 

 # If enabled, this option allows to compile the application in THUMB mode.

@@ -90,7 +90,7 @@ CHIBIOS = ../../../..
 # Startup files.

 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/startup_stm32f4xx.mk

 # HAL-OSAL files (optional).

-include $(CHIBIOS)/os/hal/hal.mk

+include $(CHIBIOS)/community/os/hal/hal.mk

 include $(CHIBIOS)/community/os/hal/ports/STM32/STM32F4xx/platform.mk

 include $(CHIBIOS)/os/hal/boards/ST_STM32F429I_DISCOVERY/board.mk

 include $(CHIBIOS)/os/hal/osal/rt/osal.mk

@@ -101,7 +101,7 @@ include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 include $(CHIBIOS)/test/rt/test.mk

 

 # Define linker script file here

-LDSCRIPT = $(CHIBIOS)/community/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F429xI.ld

+LDSCRIPT = STM32F429xI_SDRAM.ld

 

 # C sources that can be compiled in ARM or THUMB mode depending on the global

 # setting.

@@ -116,7 +116,7 @@ CSRC = $(STARTUPSRC) \
        $(CHIBIOS)/os/various/shell.c \

        $(CHIBIOS)/os/hal/lib/streams/memstreams.c \

        $(CHIBIOS)/os/hal/lib/streams/chprintf.c \

-       $(CHIBIOS)/community/os/various/devices_lib/others/ili9341.c \

+       $(CHIBIOS)/community/os/various/devices_lib/lcd/ili9341.c \

        ./main.c \

        ./wolf3d_palette.c \

        ./res/wolf3d_vgagraph_chunk87.c \

@@ -155,7 +155,7 @@ INCDIR = $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
          $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \

          $(CHIBIOS)/os/various \

          $(CHIBIOS)/os/hal/lib/streams \

-         $(CHIBIOS)/community/os/various/devices_lib/others \

+         $(CHIBIOS)/community/os/various/devices_lib/lcd \

          ./res \

          ./stmdrivers \

          # eol

diff --git a/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/STM32F429xI_SDRAM.ld b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/STM32F429xI_SDRAM.ld
new file mode 100644
index 0000000..1fb424a
--- /dev/null
+++ b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/STM32F429xI_SDRAM.ld
@@ -0,0 +1,54 @@
+/*

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

+

+    This file is part of ChibiOS.

+

+    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.

+

+    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/>.

+*/

+

+/*

+ * ST32F429xI memory setup.

+ * Note: Use of ram1, ram2 and ram3 is mutually exclusive with use of ram0.

+ */

+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 */

+}

+

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

+   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

+   the main() function.*/

+REGION_ALIAS("PROCESS_STACK_RAM", ram0);

+

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

+REGION_ALIAS("DATA_RAM", ram0);

+

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

+REGION_ALIAS("BSS_RAM", ram0);

+

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

+REGION_ALIAS("SDRAM_RAM", ram7);

+

+INCLUDE rules.ld