diff options
| author | barthess <barthess@yandex.ru> | 2015-06-28 23:25:36 +0300 |
|---|---|---|
| committer | barthess <barthess@yandex.ru> | 2015-06-28 23:25:36 +0300 |
| commit | d66299ff755314ab6ca66192369b37fe7e4377f7 (patch) | |
| tree | d143d87bca90204818fad7f3f1821a39f1d1ced9 | |
| parent | 984997f8fad5c4c5b4d0489f11936ddad2349475 (diff) | |
| download | ChibiOS-Contrib-d66299ff755314ab6ca66192369b37fe7e4377f7.tar.gz ChibiOS-Contrib-d66299ff755314ab6ca66192369b37fe7e4377f7.tar.bz2 ChibiOS-Contrib-d66299ff755314ab6ca66192369b37fe7e4377f7.zip | |
Minor improvements in DMA2D demo
| -rw-r--r-- | demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/Makefile | 10 | ||||
| -rw-r--r-- | demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/STM32F429xI_SDRAM.ld (renamed from os/common/ports/ARMCMx/compilers/GCC/ld/STM32F429xI.ld) | 0 | ||||
| -rw-r--r-- | os/various/devices_lib/lcd/ili9341.c (renamed from os/various/devices_lib/others/ili9341.c) | 0 | ||||
| -rw-r--r-- | os/various/devices_lib/lcd/ili9341.h (renamed from os/various/devices_lib/others/ili9341.h) | 0 |
4 files changed, 5 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/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F429xI.ld b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/STM32F429xI_SDRAM.ld index 1fb424a..1fb424a 100644 --- a/os/common/ports/ARMCMx/compilers/GCC/ld/STM32F429xI.ld +++ b/demos/STM32/RT-STM32F429-DISCOVERY-DMA2D/STM32F429xI_SDRAM.ld diff --git a/os/various/devices_lib/others/ili9341.c b/os/various/devices_lib/lcd/ili9341.c index 979e502..979e502 100644 --- a/os/various/devices_lib/others/ili9341.c +++ b/os/various/devices_lib/lcd/ili9341.c diff --git a/os/various/devices_lib/others/ili9341.h b/os/various/devices_lib/lcd/ili9341.h index 007c4fd..007c4fd 100644 --- a/os/various/devices_lib/others/ili9341.h +++ b/os/various/devices_lib/lcd/ili9341.h |