From f265924396167729e8d9fb36a0383263f36c1270 Mon Sep 17 00:00:00 2001
From: inmarket <andrewh@inmarket.com.au>
Date: Tue, 27 Feb 2018 17:44:21 +1000
Subject: First set of V3 macro changes

---
 boards/base/STM32F746-Discovery/board.mk          | 2 +-
 boards/base/STM32F746-Discovery/board_STM32LTDC.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'boards/base/STM32F746-Discovery')

diff --git a/boards/base/STM32F746-Discovery/board.mk b/boards/base/STM32F746-Discovery/board.mk
index eb9bec61..a67d602a 100644
--- a/boards/base/STM32F746-Discovery/board.mk
+++ b/boards/base/STM32F746-Discovery/board.mk
@@ -17,7 +17,7 @@ ifeq ($(OPT_OS),raw32)
 				$(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
-	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/STM32F7xx/Include \
 				$(CMSIS)/Include
 	LDSCRIPT = $(GFXLIB)/boards/base/STM32F746-Discovery/stm32f746nghx_flash.ld
diff --git a/boards/base/STM32F746-Discovery/board_STM32LTDC.h b/boards/base/STM32F746-Discovery/board_STM32LTDC.h
index 55a322b6..231d51b3 100644
--- a/boards/base/STM32F746-Discovery/board_STM32LTDC.h
+++ b/boards/base/STM32F746-Discovery/board_STM32LTDC.h
@@ -11,7 +11,7 @@
 #include "stm32f746g_discovery_sdram.h"
 
 #ifndef GFX_LTDC_USE_DIRECTIO
-	#define GFX_LTDC_USE_DIRECTIO	TRUE
+	#define GFX_LTDC_USE_DIRECTIO	GFXON
 #endif
 #ifndef GFX_LTDC_TIMING_SET
 	/* Options are:
@@ -36,7 +36,7 @@
 	#define AFRH	AFR[1]
 #endif
 
-#define ALLOW_2ND_LAYER		TRUE
+#define ALLOW_2ND_LAYER		GFXON
 
 static const ltdcConfig driverCfg = {
 	480, 272,								// Width, Height (pixels)
-- 
cgit v1.2.3