diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-10-06 12:10:11 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-10-06 12:10:11 +1000 |
| commit | 80299276b7134693a6f02fb8fa791d0a15ed1eab (patch) | |
| tree | e1824bd6b9aa27a71372f67c6a0f96b9f625abd7 /boards/base/STM32F746-Discovery/board.mk | |
| parent | 754d2e072b51bc43c72a37d46e22337d594f18dc (diff) | |
| parent | a35ee53d0a28cb0b6b61944a1ed698a0cef85839 (diff) | |
| download | uGFX-80299276b7134693a6f02fb8fa791d0a15ed1eab.tar.gz uGFX-80299276b7134693a6f02fb8fa791d0a15ed1eab.tar.bz2 uGFX-80299276b7134693a6f02fb8fa791d0a15ed1eab.zip | |
Merge branch 'master' into TextEdit
Diffstat (limited to 'boards/base/STM32F746-Discovery/board.mk')
| -rw-r--r-- | boards/base/STM32F746-Discovery/board.mk | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/boards/base/STM32F746-Discovery/board.mk b/boards/base/STM32F746-Discovery/board.mk index 9386fae0..71d820ca 100644 --- a/boards/base/STM32F746-Discovery/board.mk +++ b/boards/base/STM32F746-Discovery/board.mk @@ -1,30 +1,25 @@ -GFXINC += $(GFXLIB)/boards/base/STM32F746-Discovery +GFXINC += $(GFXLIB)/boards/base/STM32F746-Discovery \ + $(STMHAL)/Inc GFXSRC += $(GFXLIB)/boards/base/STM32F746-Discovery/stm32f746g_discovery_sdram.c \ - $(GFXLIB)/boards/base/STM32F746-Discovery/stm32f7xx_ll_fmc.c -GFXDEFS += STM32F746xx - + $(GFXLIB)/boards/base/STM32F746-Discovery/stm32f7_i2c.c + ifeq ($(OPT_OS),raw32) - GFXSRC += $(HAL)/Src/stm32f7xx_hal.c \ - $(HAL)/Src/stm32f7xx_hal_cortex.c \ - $(HAL)/Src/stm32f7xx_hal_flash.c \ - $(HAL)/Src/stm32f7xx_hal_flash_ex.c \ - $(HAL)/Src/stm32f7xx_hal_rcc.c \ - $(HAL)/Src/stm32f7xx_hal_rcc_ex.h \ - $(HAL)/Src/stm32f7xx_hal_gpio.c \ - $(HAL)/Src/stm32f7xx_hal_pwr.c \ - $(HAL)/Src/stm32f7xx_hal_pwr_ex.c \ - $(HAL)/Src/stm32f7xx_hal_sdram.c \ - $(HAL)/Src/stm32f7xx_hal_dma.c + GFXDEFS += STM32F746xx + GFXSRC += $(STMHAL)/Src/stm32f7xx_hal.c \ + $(STMHAL)/Src/stm32f7xx_hal_cortex.c \ + $(STMHAL)/Src/stm32f7xx_hal_rcc.c \ + $(STMHAL)/Src/stm32f7xx_hal_rcc_ex.h \ + $(STMHAL)/Src/stm32f7xx_hal_gpio.c \ + $(STMHAL)/Src/stm32f7xx_hal_pwr.c \ + $(STMHAL)/Src/stm32f7xx_hal_pwr_ex.c GFXSRC += $(GFXLIB)/boards/base/STM32F746-Discovery/stm32f746g_raw32_startup.s \ $(GFXLIB)/boards/base/STM32F746-Discovery/stm32f746g_raw32_ugfx.c \ $(GFXLIB)/boards/base/STM32F746-Discovery/stm32f746g_raw32_system.c \ - $(GFXLIB)/boards/base/STM32F746-Discovery/stm32f746g_raw32_interrupts.c \ - $(GFXLIB)/boards/base/STM32F746-Discovery/stm32f7_i2c.c + $(GFXLIB)/boards/base/STM32F746-Discovery/stm32f746g_raw32_interrupts.c GFXDEFS += GFX_OS_EXTRA_INIT_FUNCTION=Raw32OSInit GFX_OS_INIT_NO_WARNING=TRUE - SRCFLAGS+= -std=c99 GFXINC += $(CMSIS)/Device/ST/STM32F7xx/Include \ $(CMSIS)/Include \ - $(HAL)/Inc + $(STMHAL)/Inc LDSCRIPT = $(GFXLIB)/boards/base/STM32F746-Discovery/stm32f746nghx_flash.ld endif |