Updating STM32F429i-Discovery board file for ChibiOS

boards/base/STM32F429i-Discovery/board.mk

@@ -1,7 +0,0 @@
-GFXINC  +=	$(GFXLIB)/boards/base/STM32F429i-Discovery
-GFXSRC  +=	$(GFXLIB)/boards/base/STM32F429i-Discovery/stm32f429i_discovery_sdram.c \
-			$(GFXLIB)/boards/base/STM32F429i-Discovery/stm32f4xx_fmc.c
-
-GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE
-include $(GFXLIB)/drivers/gdisp/STM32LTDC/driver.mk
-include $(GFXLIB)/drivers/ginput/touch/STMPE811/driver.mk

boards/base/STM32F429i-Discovery/chibios/board.mk

@@ -0,0 +1,7 @@
+GFXINC  +=	$(GFXLIB)/boards/base/STM32F429i-Discovery/chibios
+GFXSRC  +=	$(GFXLIB)/boards/base/STM32F429i-Discovery/chibios/stm32f429i_discovery_sdram.c \
+			$(GFXLIB)/boards/base/STM32F429i-Discovery/chibios/stm32f4xx_fmc.c
+
+GFXDEFS += -DGFX_USE_OS_CHIBIOS=TRUE
+include $(GFXLIB)/drivers/gdisp/STM32LTDC/driver.mk
+include $(GFXLIB)/drivers/ginput/touch/STMPE811/driver.mk

boards/base/STM32F429i-Discovery/chibios/board_STM32LTDC.h

@@ -49,7 +49,7 @@ static const ltdcConfig driverCfg = {
 	},
 #if ALLOW_2ND_LAYER
 	{										// Foreground layer config (if turned on)
-		(LLDCOLOR_TYPE *)(SDRAM_DEVICE_ADDR+(240 * 320 * LTDC_PIXELBYTES)), // Frame buffer address
+		(LLDCOLOR_TYPE *)(SDRAM_BANK_ADDR+(240 * 320 * LTDC_PIXELBYTES)), // Frame buffer address
 		240, 320,							// width, height
 		240 * LTDC_PIXELBYTES,				// pitch
 		LTDC_PIXELFORMAT,					// fmt

boards/base/STM32F429i-Discovery/chibios/gmouse_lld_STMPE811_board.h

@@ -50,9 +50,15 @@ static bool_t init_board(GMouse* m, unsigned driverinstance) {
 		return FALSE;
 
 	// Set pin modes
+	#if CH_KERNEL_MAJOR == 2
 		palSetPadMode(GPIOA, 15, PAL_MODE_INPUT | PAL_STM32_PUDR_FLOATING);			/* TP IRQ */
 		palSetPadMode(GPIOA, 8, PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN);	/* SCL */
 		palSetPadMode(GPIOC, 9, PAL_MODE_ALTERNATE(4) | PAL_STM32_OTYPE_OPENDRAIN);	/* SDA */
+	#else
+		palSetPadMode(GPIOA, 15, PAL_MODE_INPUT | PAL_STM32_PUPDR_FLOATING);			/* TP IRQ */
+		palSetPadMode(GPIOA, 8, PAL_MODE_ALTERNATE(4) | PAL_STM32_PUPDR_FLOATING);	/* SCL */
+		palSetPadMode(GPIOC, 9, PAL_MODE_ALTERNATE(4) | PAL_STM32_PUPDR_FLOATING);	/* SDA */
+	#endif
 
 	// Start the I2C
 	i2cStart(&I2CD3, &i2ccfg);

boards/base/STM32F429i-Discovery/chibios/stm32f4xx_fmc.c

@@ -37,10 +37,10 @@
 #include "stm32f4xx_fmc.h"
 //#include "stm32f4xx_rcc.h"
 
-#if CH_KERNEL_MAJOR == 3
-	#define assert_param(expr) chDbgAssert(expr,"STPeriph FMC")
-#else
+#if CH_KERNEL_MAJOR == 2
 	#define assert_param(expr) chDbgAssert(expr,"STPeriph FMC","")
+#else
+	#define assert_param(expr) chDbgAssert(expr,"STPeriph FMC")
 #endif
 
 /** @addtogroup STM32F4xx_StdPeriph_Driver