diff options
| author | Thomas Sterren <thomas.sterren@simulton.com> | 2018-03-06 09:38:37 +0100 |
|---|---|---|
| committer | Thomas Sterren <thomas.sterren@simulton.com> | 2018-03-06 09:38:37 +0100 |
| commit | 65d00b16b9fbb46ecd69a383dc4adde5c5c03790 (patch) | |
| tree | 30920f0457522be32ce2b332afe0d2916d93cf66 /boards/base/STM32F439i-Eval/CubeHal | |
| parent | 992850bcb1992ff052d5ac2379e4675a34861723 (diff) | |
| parent | f265924396167729e8d9fb36a0383263f36c1270 (diff) | |
| download | uGFX-65d00b16b9fbb46ecd69a383dc4adde5c5c03790.tar.gz uGFX-65d00b16b9fbb46ecd69a383dc4adde5c5c03790.tar.bz2 uGFX-65d00b16b9fbb46ecd69a383dc4adde5c5c03790.zip | |
Merge branch 'master' of https://git.ugfx.io/uGFX/uGFX
Diffstat (limited to 'boards/base/STM32F439i-Eval/CubeHal')
| -rw-r--r-- | boards/base/STM32F439i-Eval/CubeHal/board.mk | 2 | ||||
| -rw-r--r-- | boards/base/STM32F439i-Eval/CubeHal/board_STM32LTDC.h | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/boards/base/STM32F439i-Eval/CubeHal/board.mk b/boards/base/STM32F439i-Eval/CubeHal/board.mk index a3bb8ad2..cdeba6d7 100644 --- a/boards/base/STM32F439i-Eval/CubeHal/board.mk +++ b/boards/base/STM32F439i-Eval/CubeHal/board.mk @@ -19,7 +19,7 @@ ifeq ($(OPT_OS),raw32) $(GFXLIB)/boards/base/STM32F439i-Eval/CubeHAL/stm32f439i_raw32_ugfx.c \ $(GFXLIB)/boards/base/STM32F439i-Eval/CubeHAL/stm32f439i_raw32_system.c \ $(GFXLIB)/boards/base/STM32F439i-Eval/CubeHAL/stm32f439i_raw32_interrupts.c - GFXDEFS += GFX_OS_PRE_INIT_FUNCTION=Raw32OSInit GFX_OS_INIT_NO_WARNING=TRUE + GFXDEFS += GFX_OS_PRE_INIT_FUNCTION=Raw32OSInit GFX_OS_INIT_NO_WARNING=GFXON GFXINC += $(CMSIS)/Device/ST/STM32F4xx/Include \ $(CMSIS)/Include \ $(STMHAL)/Inc diff --git a/boards/base/STM32F439i-Eval/CubeHal/board_STM32LTDC.h b/boards/base/STM32F439i-Eval/CubeHal/board_STM32LTDC.h index fd9a32ca..7ddd554f 100644 --- a/boards/base/STM32F439i-Eval/CubeHal/board_STM32LTDC.h +++ b/boards/base/STM32F439i-Eval/CubeHal/board_STM32LTDC.h @@ -17,7 +17,7 @@ #include "stm32f4xx_hal.h" #include "stm324x9i_eval_sdram.h" -#define ALLOW_2ND_LAYER TRUE +#define ALLOW_2ND_LAYER GFXON // Panel parameters // This panel is a AMPIRE640480 panel. @@ -89,6 +89,7 @@ static void configureLcdClock(void) RCC->PLLSAICFGR = (LCD_PLLSAIN_VALUE << 6) | (LCD_PLLSAIR_VALUE << 28) | (LCD_PLLSAIQ_VALUE << 24); RCC->DCKCFGR = (RCC->DCKCFGR & ~RCC_DCKCFGR_PLLSAIDIVR) | LCD_PLLSAIDIVR_VALUE; RCC->CR |= RCC_CR_PLLSAION; + while(!(RCC->CR & RCC_CR_PLLSAIRDY)); // wait for PLLSAI to lock #endif } |