aboutsummaryrefslogtreecommitdiffstats
path: root/boards/base/Mikromedia-STM32-M4-ILI9341
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@unormal.org>2014-10-27 00:14:28 +0100
committerJoel Bodenmann <joel@unormal.org>2014-10-27 00:14:28 +0100
commit56bbacecc1c784a1dc2e642ccbfd049c1e6cd80c (patch)
treec902f0663dac98381728ae7bcdbb96b4fb446ce6 /boards/base/Mikromedia-STM32-M4-ILI9341
parentccf232333546713870a9b39fed35571ff92acd85 (diff)
parentcb668266b54fb0feb7cda9f973b0cc6bc40873ab (diff)
downloaduGFX-56bbacecc1c784a1dc2e642ccbfd049c1e6cd80c.tar.gz
uGFX-56bbacecc1c784a1dc2e642ccbfd049c1e6cd80c.tar.bz2
uGFX-56bbacecc1c784a1dc2e642ccbfd049c1e6cd80c.zip
Merge branch 'master' into newmouse
Diffstat (limited to 'boards/base/Mikromedia-STM32-M4-ILI9341')
-rw-r--r--boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/Makefile2
-rw-r--r--boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/Makefile b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/Makefile
index c4938d5f..7eb8eb3e 100644
--- a/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/Makefile
+++ b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/Makefile
@@ -26,7 +26,7 @@ ifeq ($(OPT_OS),chibios)
CHIBIOS_PORT = GCC/ARMCMx/STM32F4xx
CHIBIOS_LDSCRIPT = STM32F407xG.ld
# We define a non standard board script as this is not a standard ChibiOS supported board
- include $(GFXLIB)/boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board/board.mk
+ include $(GFXLIB)/boards/base/$(GFXBOARD)/ChibiOS_Board/board.mk
endif
##############################################################################################
diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/Makefile b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/Makefile
index 875f79b1..a68e06e4 100644
--- a/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/Makefile
+++ b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/Makefile
@@ -28,7 +28,7 @@ ifeq ($(OPT_OS),chibios)
CHIBIOS_PORT = stm32f4xx
CHIBIOS_LDSCRIPT = STM32F407xG.ld
# We define a non standard board script as this is not a standard ChibiOS supported board
- include $(GFXLIB)/boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board/board.mk
+ include $(GFXLIB)/boards/base/$(GFXBOARD)/ChibiOS_Board/board.mk
endif
##############################################################################################