From 8383cf97d61616139abe27a154e486b778ce64ec Mon Sep 17 00:00:00 2001 From: Yihui Xiong Date: Wed, 8 Oct 2014 10:47:49 +0800 Subject: [PATCH 1/2] [DISC_F407VG & ARCH_MAX] change default toolchain --- workspace_tools/targets.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/workspace_tools/targets.py b/workspace_tools/targets.py index 61130e5772..6cff313128 100644 --- a/workspace_tools/targets.py +++ b/workspace_tools/targets.py @@ -630,7 +630,6 @@ class DISCO_F407VG(Target): self.core = "Cortex-M4F" self.extra_labels = ['STM', 'STM32F4', 'STM32F407', 'STM32F407VG'] self.supported_toolchains = ["ARM", "GCC_ARM"] - self.default_toolchain = "uARM" class ARCH_MAX(Target): def __init__(self): @@ -638,7 +637,6 @@ class ARCH_MAX(Target): self.core = "Cortex-M4F" self.extra_labels = ['STM', 'STM32F4', 'STM32F407', 'STM32F407VG'] self.supported_toolchains = ["ARM", "GCC_ARM"] - self.default_toolchain = "uARM" class DISCO_F303VC(Target): def __init__(self): From 5098e3b48010e9d2bc19551d4c957b3df42cc605 Mon Sep 17 00:00:00 2001 From: Yihui Xiong Date: Wed, 8 Oct 2014 15:40:18 +0800 Subject: [PATCH 2/2] [HAL][ARCH_MAX] use different PeripheralNames.h for STDIO_UART --- .../TARGET_ARCH_MAX/PeripheralNames.h | 85 +++++++++++++++++++ .../PeripheralNames.h | 0 2 files changed, 85 insertions(+) create mode 100644 libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F407VG/TARGET_ARCH_MAX/PeripheralNames.h rename libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F407VG/{ => TARGET_DISCO_F407VG}/PeripheralNames.h (100%) diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F407VG/TARGET_ARCH_MAX/PeripheralNames.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F407VG/TARGET_ARCH_MAX/PeripheralNames.h new file mode 100644 index 0000000000..4b2c69472f --- /dev/null +++ b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F407VG/TARGET_ARCH_MAX/PeripheralNames.h @@ -0,0 +1,85 @@ +/* mbed Microcontroller Library + ******************************************************************************* + * Copyright (c) 2014, STMicroelectronics + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. Neither the name of STMicroelectronics nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + ******************************************************************************* + */ +#ifndef MBED_PERIPHERALNAMES_H +#define MBED_PERIPHERALNAMES_H + +#include "cmsis.h" + +#ifdef __cplusplus +extern "C" { +#endif + +typedef enum { + ADC_1 = (int)ADC1_BASE +} ADCName; + +typedef enum { + DAC_0 = 0, + DAC_1 +} DACName; + +typedef enum { + UART_1 = (int)USART1_BASE, + UART_2 = (int)USART2_BASE, + UART_6 = (int)USART6_BASE +} UARTName; + +#define STDIO_UART_TX PC_6 +#define STDIO_UART_RX PC_7 +#define STDIO_UART UART_6 + +typedef enum { + SPI_1 = (int)SPI1_BASE, + SPI_2 = (int)SPI2_BASE, + SPI_3 = (int)SPI3_BASE +} SPIName; + +typedef enum { + I2C_1 = (int)I2C1_BASE, + I2C_2 = (int)I2C2_BASE, + I2C_3 = (int)I2C3_BASE +} I2CName; + +typedef enum { + PWM_1 = (int)TIM1_BASE, + PWM_2 = (int)TIM2_BASE, + PWM_3 = (int)TIM3_BASE, + PWM_4 = (int)TIM4_BASE, + PWM_5 = (int)TIM5_BASE, + PWM_9 = (int)TIM9_BASE, + PWM_10 = (int)TIM10_BASE, + PWM_11 = (int)TIM11_BASE +} PWMName; + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F407VG/PeripheralNames.h b/libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F407VG/TARGET_DISCO_F407VG/PeripheralNames.h similarity index 100% rename from libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F407VG/PeripheralNames.h rename to libraries/mbed/targets/hal/TARGET_STM/TARGET_STM32F407VG/TARGET_DISCO_F407VG/PeripheralNames.h