diff options
Diffstat (limited to 'boards/base/Mikromedia-STM32-M4-ILI9341')
6 files changed, 18 insertions, 49 deletions
diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board/board.h b/boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board/board.h index 41f15201..b5ee34ad 100644 --- a/boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board/board.h +++ b/boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board/board.h @@ -49,6 +49,7 @@ * MCU type as defined in the ST header.
*/
#define STM32F40_41xxx
+#define STM32F407xx
/*
* IO pins assignments.
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 ac483689..8baa399f 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 @@ -6,22 +6,16 @@ # General settings # See $(GFXLIB)/tools/gmake_scripts/readme.txt for the list of variables - OPT_VERBOSE_COMPILE = no - OPT_GENERATE_LISTINGS = yes - OPT_GENERATE_MAP = yes - OPT_COPY_EXE = no - OPT_LINK_OPTIMIZE = yes - OPT_NONSTANDARD_FLAGS = no OPT_NATIVEOS = chibios OPT_OS = chibios OPT_THUMB = yes + OPT_LINK_OPTIMIZE = yes OPT_CPU = stm32m4 # uGFX settings # See $(GFXLIB)/tools/gmake_scripts/library_ugfx.mk for the list of variables GFXLIB = ../uGFX GFXBOARD = Mikromedia-STM32-M4-ILI9341 - #GFXDRIVERS = multiple/uGFXnet GFXDEMO = modules/gdisp/basics # ChibiOS settings @@ -31,7 +25,6 @@ ifeq ($(OPT_OS),chibios) CHIBIOS_BOARD = CHIBIOS_PLATFORM = STM32F4xx CHIBIOS_PORT = GCC/ARMCMx/STM32F4xx - CHIBIOS_DEFS = CHIBIOS_LDSCRIPT = STM32F407xG.ld # We define a non standard board script as this is not a standard ChibiOS supported board include $(GFXLIB)/boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board/board.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 d19c3d28..55778283 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 @@ -6,33 +6,27 @@ # General settings # See $(GFXLIB)/tools/gmake_scripts/readme.txt for the list of variables - OPT_VERBOSE_COMPILE = no - OPT_GENERATE_LISTINGS = yes - OPT_GENERATE_MAP = yes - OPT_COPY_EXE = no - OPT_LINK_OPTIMIZE = yes - OPT_NONSTANDARD_FLAGS = no OPT_NATIVEOS = chibios OPT_OS = chibios OPT_THUMB = yes + OPT_LINK_OPTIMIZE = yes OPT_CPU = stm32m4 # uGFX settings # See $(GFXLIB)/tools/gmake_scripts/library_ugfx.mk for the list of variables GFXLIB = ../uGFX GFXBOARD = Mikromedia-STM32-M4-ILI9341 - #GFXDRIVERS = multiple/uGFXnet GFXDEMO = modules/gdisp/basics # ChibiOS settings ifeq ($(OPT_OS),chibios) # See $(GFXLIB)/tools/gmake_scripts/os_chibios.mk for the list of variables - CHIBIOS = ../ChibiOS - CHBIOS_VERSION = 3 + CHIBIOS = ../ChibiOS3 + CHIBIOS_VERSION = 3 CHIBIOS_BOARD = + CHIBIOS_CPUCLASS = ARMCMx CHIBIOS_PLATFORM = STM32/STM32F4xx - CHIBIOS_PORT = ARMCMx/compilers/GCC/mk/port_stm32f4xx - CHIBIOS_DEFS = + CHIBIOS_PORT = stm32f4xx CHIBIOS_LDSCRIPT = STM32F407xG.ld # We define a non standard board script as this is not a standard ChibiOS supported board include $(GFXLIB)/boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board/board.mk @@ -65,22 +59,3 @@ include $(GFXLIB)/tools/gmake_scripts/library_ugfx.mk include $(GFXLIB)/tools/gmake_scripts/os_$(OPT_OS).mk include $(GFXLIB)/tools/gmake_scripts/compiler_gcc.mk # *** EOF *** -############################################################################## -############################################################################### -# Architecture or project specific options -# - -# Stack size to be allocated to the Cortex-M process stack. This stack is -# the stack used by the main() thread. -ifeq ($(USE_PROCESS_STACKSIZE),) - USE_PROCESS_STACKSIZE = 0x400 -endif - -# Stack size to the allocated to the Cortex-M main/exceptions stack. This -# stack is used for processing interrupts and exceptions. -ifeq ($(USE_EXCEPTIONS_STACKSIZE),) - USE_EXCEPTIONS_STACKSIZE = 0x400 -endif - -RULESPATH = $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC -include $(RULESPATH)/rules.mk
\ No newline at end of file diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/chconf.h b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/chconf.h index 150bd73c..53700421 100644 --- a/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/chconf.h +++ b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/chconf.h @@ -1,5 +1,5 @@ /* - ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio + ChibiOS - Copyright (C) 2006-2014 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/halconf.h b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/halconf.h index 40c57eeb..06d3e2ff 100644 --- a/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/halconf.h +++ b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/halconf.h @@ -1,5 +1,5 @@ /* - ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio + ChibiOS - Copyright (C) 2006-2014 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -31,13 +31,6 @@ #include "mcuconf.h" /** - * @brief Enables the TM subsystem. - */ -#if !defined(HAL_USE_TM) || defined(__DOXYGEN__) -#define HAL_USE_TM FALSE -#endif - -/** * @brief Enables the PAL subsystem. */ #if !defined(HAL_USE_PAL) || defined(__DOXYGEN__) @@ -80,6 +73,13 @@ #endif /** + * @brief Enables the I2S subsystem. + */ +#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__) +#define HAL_USE_I2S FALSE +#endif + +/** * @brief Enables the ICU subsystem. */ #if !defined(HAL_USE_ICU) || defined(__DOXYGEN__) @@ -104,7 +104,7 @@ * @brief Enables the PWM subsystem. */ #if !defined(HAL_USE_PWM) || defined(__DOXYGEN__) -#define HAL_USE_PWM TRUE +#define HAL_USE_PWM FALSE #endif /** diff --git a/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/mcuconf.h b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/mcuconf.h index 047224f1..1f8378d2 100644 --- a/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/mcuconf.h +++ b/boards/base/Mikromedia-STM32-M4-ILI9341/example_chibios_3.x/mcuconf.h @@ -1,5 +1,5 @@ /* - ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio + ChibiOS - Copyright (C) 2006-2014 Giovanni Di Sirio Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. |