From 38fb787cbdf346ee76a12ea6c111b13dbe84eba5 Mon Sep 17 00:00:00 2001 From: inmarket Date: Mon, 12 May 2014 09:26:36 +1000 Subject: [PATCH] Restore library locations to what is used in all other example makefiles --- .../Mikromedia-STM32-M4-ILI9341/example_chibios_2.x/Makefile | 4 ++-- .../Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 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 71ceb5eb..7b982d80 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 @@ -67,7 +67,7 @@ SW = .. PROJECT = ch # Imported source files and paths -CHIBIOS = ../../../../../ChibiOS_2.6.4 +CHIBIOS = ../ChibiOS #include $(CHIBIOS)/boards/MIKROMEDIA_STM32_M4/board.mk # Not a standard ChibiOS supported board include $(CHIBIOS)/os/hal/platforms/STM32F4xx/platform.mk include $(CHIBIOS)/os/hal/hal.mk @@ -76,7 +76,7 @@ include $(CHIBIOS)/os/kernel/kernel.mk LDSCRIPT= $(PORTLD)/STM32F407xG.ld # Imported source files and paths for uGFX -GFXLIB = ../../../../ +GFXLIB = ../ugfx include $(GFXLIB)/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk include $(GFXLIB)/boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board/board.mk # The replacement ChibiOS board files include $(GFXLIB)/gfx.mk 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 17baf5ad..4f55e0fd 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 @@ -83,7 +83,7 @@ SW = .. PROJECT = ch # Imported source files and paths -CHIBIOS = ../../../../../ChibiOS +CHIBIOS = ../ChibiOS #include $(CHIBIOS)/boards/MIKROMEDIA_STM32_M4/board.mk # Not a standard ChibiOS supported board include $(CHIBIOS)/os/hal/hal.mk include $(CHIBIOS)/os/hal/ports/STM32/STM32F4xx/platform.mk @@ -93,7 +93,7 @@ include $(CHIBIOS)/os/rt/ports/ARMCMx/compilers/GCC/mk/port_stm32f4xx.mk LDSCRIPT= $(PORTLD)/STM32F407xG.ld # Imported source files and paths for uGFX -GFXLIB = ../../../../ +GFXLIB = ../ugfx include $(GFXLIB)/boards/base/Mikromedia-STM32-M4-ILI9341/board.mk include $(GFXLIB)/boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board/board.mk # The replacement ChibiOS board files include $(GFXLIB)/gfx.mk