Merge arm branch into master
The following changes since commit 38ca5843: doc: update MAINTAINERS for .rst files (2017-01-23 18:36:28 +0000) are available in the git repository at: https://github.com/zephyrproject-rtos/zephyr arm for you to fetch changes up to 098f2898: Main changes: - Added support for STM32F3X SoC - Added support for ARM AN383 SoC - Added board support for STM3210C-EVAL, NUCLEO-F334R8, STM32373C-EVAL, MPS2 w/AN383 - Start work on replace scs/scb layers with CMSIS - Converted Kinetis SPI & UART drivers to use MCUX HAL - Added drivers for ARM CMSDK Dual Timer & Timer ---------------------------------------------------------------- Adam Podogrocki (11): soc/stm32: add initial support for STM32F3X series clock/stm32: add STM32F3X reset and clock control exti/stm32: add support for F334 & F373 MCUs flash/stm32: flash driver for STM32F3x series microcontrollers gpio/stm32: provide GPIO driver implementation for STM32F3X family pinmux/stm32: extend pinmux driver functionality to support STM32F3X series MCUs boards: add initial support for Nucleo-64 with Soc STM32F334 boards: add initial support for STM32373C-EVAL with SoC STM32F373VC pinmux/stm32: default pin assignment for STM3210C-EVAL board pinmux/stm32: default pin assignment for NUCLEO-F334R8 board pinmux/stm32: default pin assignment for STM32373C-EVAL board Carles Cufi (1): arm: cmsis: Convert enable_floating_point to use CMSIS David Brown (1): arm: cortex-m: Implement CONFIG_TEXT_SECTION_OFFSET Erwan Gouriou (3): board: add nucleo_401re board documentation license: Replace Apache boilerplate with SPDX tag boards:arm: Provide debug option on some boards Gil Pitney (1): cc3200: Added board documentation in RST format. Jon Medhurst (2): arm: soc: Add SoC series for ARM's Cortex-M Prototyping System (MPS2) boards: arm: Add board for MPS2 with AN383 Kumar Gala (12): arm: kinetis: Remove duplicate & unused defines arm: nvic: kill _NvicSwInterruptTrigger uart/stm32: add STM32F3X support for uart arm: cmsis: Remove unused code from scb/scs layers arm: cmsis: Introduce CMSIS layer arm: cmsis: Convert DO_REBOOT to use CMSIS arm: cmsis: Convert systick to CMSIS arm: cmsis: Convert relocate_vector_table to use CMSIS timer: nrf_rtc: Use CMSIS NVIC APIs directly clock_control: nrf5_power: Use CMSIS NVIC APIs directly Bluetooth: Controller: Use CMSIS NVIC APIs directly tests: arm_irq_vector_table: Use CMSIS NVIC APIs directly Maureen Helm (12): serial: Introduce new mcux shim driver frdm_k64f: hexiwear_k64: Add defaults for the mcux serial driver k64: Change the default serial driver to the mcux one frdm_k64f: hexiwear_k64: Remove defaults for the uart_k20 driver serial: k64: Remove the uart_k20 driver gpio: serial: Fix NXP copyright spi: Add shared default configs spi: Introduce new mcux shim driver k64: Change the default spi driver to the mcux shim tests: Update spi driver test for mcux samples: net: Increase spi log level spi: k64: Remove the k64 spi driver Michael Scott (1): drivers: gpio: stm32: fix CONFIG_SOC_SERIES_STM32F4X build break Ricardo Salveti (4): arm: set default vector table address in prep_c when XIP arm/nordic_nrf5: enable SOC_FLASH_NRF5 by default if FLASH is enabled boards: 96b_nitrogen: Add button and LED definitions boards: 96b_carbon: Add LED definitions Vincenzo Frascino (7): counter: cmsdk: Add common interface soc: arm: beetle: Add Timers IRQ map counter: cmsdk: Add clock control to TMR Counters. counter: cmsdk: Add Timer 0 and 1 as Timers counter: cmsdk: Add DualTimer as Counter counter: cmsdk: Add Dualtimer as a Timer board: v2m_beetle: Update defconfig MAINTAINERS | 7 + arch/arm/core/Kconfig | 1 + arch/arm/core/cortex_m/Makefile | 1 + arch/arm/core/cortex_m/prep_c.c | 24 +- arch/arm/core/cortex_m/scb.c | 69 +- arch/arm/soc/arm/beetle/soc_irq.h | 7 + arch/arm/soc/arm/mps2/Kconfig.defconfig.mps2_an385 | 16 + arch/arm/soc/arm/mps2/Kconfig.defconfig.series | 34 + arch/arm/soc/arm/mps2/Kconfig.series | 14 + arch/arm/soc/arm/mps2/Kconfig.soc | 15 + arch/arm/soc/arm/mps2/Makefile | 7 + arch/arm/soc/arm/mps2/linker.ld | 9 + arch/arm/soc/arm/mps2/soc.c | 31 + arch/arm/soc/arm/mps2/soc.h | 12 + arch/arm/soc/arm/mps2/soc_devices.h | 31 + arch/arm/soc/arm/mps2/soc_irq.h | 38 + arch/arm/soc/arm/mps2/soc_memory_map.h | 16 + arch/arm/soc/atmel_sam3/soc.c | 5 - arch/arm/soc/nordic_nrf5/Kconfig.defconfig | 7 + arch/arm/soc/nordic_nrf5/nrf52/soc.c | 5 - .../soc/nxp_kinetis/k6x/Kconfig.defconfig.mk64f12 | 9 +- arch/arm/soc/nxp_kinetis/k6x/Makefile | 1 - arch/arm/soc/nxp_kinetis/k6x/soc.c | 3 +- arch/arm/soc/nxp_kinetis/k6x/soc.h | 57 +- arch/arm/soc/nxp_kinetis/k6x/soc_config.c | 73 -- arch/arm/soc/st_stm32/stm32f1/soc.c | 5 - arch/arm/soc/st_stm32/stm32f1/soc.h | 7 +- .../soc/st_stm32/stm32f3/Kconfig.defconfig.series | 32 + .../st_stm32/stm32f3/Kconfig.defconfig.stm32f303xc | 28 + .../st_stm32/stm32f3/Kconfig.defconfig.stm32f334x8 | 28 + .../st_stm32/stm32f3/Kconfig.defconfig.stm32f373xc | 28 + arch/arm/soc/st_stm32/stm32f3/Kconfig.series | 18 + arch/arm/soc/st_stm32/stm32f3/Kconfig.soc | 21 + arch/arm/soc/st_stm32/stm32f3/Makefile | 11 + arch/arm/soc/st_stm32/stm32f3/flash_registers.h | 60 ++ arch/arm/soc/st_stm32/stm32f3/gpio_registers.h | 102 ++ arch/arm/soc/st_stm32/stm32f3/linker.ld | 9 + arch/arm/soc/st_stm32/stm32f3/rcc_registers.h | 89 ++ arch/arm/soc/st_stm32/stm32f3/soc.c | 54 + arch/arm/soc/st_stm32/stm32f3/soc.h | 57 + arch/arm/soc/st_stm32/stm32f3/soc_config.c | 53 + arch/arm/soc/st_stm32/stm32f3/soc_gpio.c | 209 ++++ arch/arm/soc/st_stm32/stm32f3/soc_irq.h | 118 ++ arch/arm/soc/st_stm32/stm32f3/soc_registers.h | 15 + arch/arm/soc/st_stm32/stm32f4/soc.c | 5 - arch/arm/soc/st_stm32/stm32l4/soc.c | 5 - boards/arm/96b_carbon/board.h | 20 + boards/arm/96b_nitrogen/board.h | 21 + boards/arm/cc3200_launchxl/doc/cc3200_launchxl.rst | 244 +++++ boards/arm/frdm_k64f/Kconfig.defconfig | 51 +- boards/arm/frdm_k64f/frdm_k64f_defconfig | 1 - boards/arm/frdm_k64f/pinmux.c | 4 +- boards/arm/hexiwear_k64/Kconfig.defconfig | 55 +- boards/arm/hexiwear_k64/hexiwear_k64_defconfig | 1 - boards/arm/hexiwear_k64/pinmux.c | 4 +- boards/arm/mps2_an385/Kconfig.board | 9 + boards/arm/mps2_an385/Kconfig.defconfig | 39 + boards/arm/mps2_an385/Makefile | 9 + boards/arm/mps2_an385/board.h | 12 + boards/arm/mps2_an385/doc/img/mps2.png | Bin 0 -> 771962 bytes boards/arm/mps2_an385/doc/mps2_an385.rst | 188 ++++ boards/arm/mps2_an385/mps2_an385_defconfig | 19 + boards/arm/nucleo_f334r8/Kconfig.board | 10 + boards/arm/nucleo_f334r8/Kconfig.defconfig | 13 + boards/arm/nucleo_f334r8/Makefile | 2 + boards/arm/nucleo_f334r8/Makefile.board | 7 + boards/arm/nucleo_f334r8/board.h | 26 + boards/arm/nucleo_f334r8/nucleo_f334r8_defconfig | 53 + boards/arm/nucleo_f334r8/support/openocd.cfg | 12 + boards/arm/nucleo_f401re/Makefile.board | 1 + .../doc/img/nucleo64_perf_logo_1024.png | Bin 0 -> 780528 bytes .../doc/img/nucleo_f401re_arduino.png | Bin 0 -> 575018 bytes .../nucleo_f401re/doc/img/nucleo_f401re_morpho.png | Bin 0 -> 481267 bytes boards/arm/nucleo_f401re/doc/nucleof401re.rst | 190 ++++ boards/arm/stm3210c_eval/Makefile.board | 1 + boards/arm/stm32373c_eval/Kconfig.board | 10 + boards/arm/stm32373c_eval/Kconfig.defconfig | 13 + boards/arm/stm32373c_eval/Makefile | 2 + boards/arm/stm32373c_eval/Makefile.board | 7 + boards/arm/stm32373c_eval/board.h | 32 + boards/arm/stm32373c_eval/stm32373c_eval_defconfig | 62 ++ boards/arm/stm32373c_eval/support/openocd.cfg | 12 + boards/arm/v2m_beetle/Kconfig.defconfig | 29 +- drivers/clock_control/Kconfig | 2 + drivers/clock_control/Kconfig.stm32f3x | 115 ++ drivers/clock_control/Makefile | 1 + drivers/clock_control/nrf5_power_clock.c | 9 +- drivers/clock_control/stm32f3x_clock.c | 398 +++++++ drivers/counter/Kconfig | 2 + drivers/counter/Kconfig.dtmr_cmsdk_apb | 75 ++ drivers/counter/Kconfig.tmr_cmsdk_apb | 62 +- drivers/counter/Makefile | 3 + drivers/counter/counter_dtmr_cmsdk_apb.c | 120 +++ drivers/counter/counter_tmr_cmsdk_apb.c | 55 +- drivers/counter/dualtimer_cmsdk_apb.h | 68 ++ drivers/counter/timer_cmsdk_apb.h | 40 + drivers/counter/timer_dtmr_cmsdk_apb.c | 206 ++++ drivers/counter/timer_tmr_cmsdk_apb.c | 241 +++++ drivers/flash/Kconfig | 16 +- drivers/flash/Kconfig.stm32f3x | 25 + drivers/flash/Makefile | 5 + drivers/flash/flash_stm32f3x.c | 149 +++ drivers/flash/flash_stm32f3x.h | 66 ++ drivers/flash/flash_stm32f3x_priv.c | 206 ++++ drivers/gpio/Kconfig.mcux | 2 +- drivers/gpio/gpio_mcux.c | 2 +- drivers/gpio/gpio_stm32.c | 45 +- drivers/gpio/gpio_stm32.h | 7 +- drivers/interrupt_controller/exti_stm32.c | 45 +- drivers/pinmux/Makefile | 3 + drivers/pinmux/stm32/pinmux_board_nucleo_f334r8.c | 45 + drivers/pinmux/stm32/pinmux_board_stm3210c_eval.c | 34 + drivers/pinmux/stm32/pinmux_board_stm32373c_eval.c | 34 + drivers/pinmux/stm32/pinmux_stm32.c | 12 +- drivers/pinmux/stm32/pinmux_stm32.h | 40 +- drivers/pinmux/stm32/pinmux_stm32f1.h | 3 + drivers/pinmux/stm32/pinmux_stm32f3.h | 39 + drivers/serial/Kconfig | 2 +- drivers/serial/Kconfig.k20 | 178 --- drivers/serial/Kconfig.mcux | 150 +++ drivers/serial/Makefile | 2 +- drivers/serial/uart_k20.c | 584 ---------- drivers/serial/uart_k20.h | 16 - drivers/serial/uart_k20_priv.h | 252 ----- drivers/serial/uart_mcux.c | 508 +++++++++ drivers/serial/uart_stm32.c | 16 +- drivers/serial/uart_stm32.h | 4 +- drivers/spi/Kconfig | 40 +- drivers/spi/Kconfig.mcux | 36 + drivers/spi/Makefile | 2 +- drivers/spi/spi_k64.c | 1138 -------------------- drivers/spi/spi_k64_priv.h | 166 --- drivers/spi/spi_mcux.c | 321 ++++++ drivers/timer/cortex_m_systick.c | 50 +- drivers/timer/nrf_rtc_timer.c | 3 +- ext/hal/nxp/mcux/drivers/Makefile | 3 +- ext/hal/st/stm32cube/Kbuild | 2 + include/arch/arm/cortex_m/cmsis.h | 96 ++ include/arch/arm/cortex_m/nvic.h | 26 - include/arch/arm/cortex_m/scb.h | 561 ---------- include/arch/arm/cortex_m/scripts/linker.ld | 1 + include/arch/arm/cortex_m/scs.h | 142 --- .../drivers/clock_control/stm32_clock_control.h | 3 + .../drivers/clock_control/stm32f3_clock_control.h | 114 ++ include/drivers/k20_sim.h | 10 - include/drivers/spi/spi_k64.h | 68 -- include/gpio.h | 14 + samples/net/echo_client/prj_frdm_k64f_cc2520.conf | 2 + samples/net/echo_server/prj_frdm_k64f_cc2520.conf | 2 + scripts/sanity_chk/arches/arm.ini | 2 +- subsys/bluetooth/controller/hal/nrf5/ecb.c | 3 +- subsys/bluetooth/controller/hal/nrf5/radio.c | 7 +- subsys/bluetooth/controller/hci/hci_driver.c | 6 +- tests/drivers/spi_test/src/spi.c | 7 +- tests/drivers/spi_test/testcase.ini | 4 +- tests/kernel/arm_irq_vector_table/src/main.c | 8 +- .../kernel/test_arm_irq_vector_table/src/main.c | 8 +- 157 files changed, 5744 insertions(+), 3593 deletions(-) create mode 100644 arch/arm/soc/arm/mps2/Kconfig.defconfig.mps2_an385 create mode 100644 arch/arm/soc/arm/mps2/Kconfig.defconfig.series create mode 100644 arch/arm/soc/arm/mps2/Kconfig.series create mode 100644 arch/arm/soc/arm/mps2/Kconfig.soc create mode 100644 arch/arm/soc/arm/mps2/Makefile create mode 100644 arch/arm/soc/arm/mps2/linker.ld create mode 100644 arch/arm/soc/arm/mps2/soc.c create mode 100644 arch/arm/soc/arm/mps2/soc.h create mode 100644 arch/arm/soc/arm/mps2/soc_devices.h create mode 100644 arch/arm/soc/arm/mps2/soc_irq.h create mode 100644 arch/arm/soc/arm/mps2/soc_memory_map.h delete mode 100644 arch/arm/soc/nxp_kinetis/k6x/soc_config.c create mode 100644 arch/arm/soc/st_stm32/stm32f3/Kconfig.defconfig.series create mode 100644 arch/arm/soc/st_stm32/stm32f3/Kconfig.defconfig.stm32f303xc create mode 100644 arch/arm/soc/st_stm32/stm32f3/Kconfig.defconfig.stm32f334x8 create mode 100644 arch/arm/soc/st_stm32/stm32f3/Kconfig.defconfig.stm32f373xc create mode 100644 arch/arm/soc/st_stm32/stm32f3/Kconfig.series create mode 100644 arch/arm/soc/st_stm32/stm32f3/Kconfig.soc create mode 100644 arch/arm/soc/st_stm32/stm32f3/Makefile create mode 100644 arch/arm/soc/st_stm32/stm32f3/flash_registers.h create mode 100644 arch/arm/soc/st_stm32/stm32f3/gpio_registers.h create mode 100644 arch/arm/soc/st_stm32/stm32f3/linker.ld create mode 100644 arch/arm/soc/st_stm32/stm32f3/rcc_registers.h create mode 100644 arch/arm/soc/st_stm32/stm32f3/soc.c create mode 100644 arch/arm/soc/st_stm32/stm32f3/soc.h create mode 100644 arch/arm/soc/st_stm32/stm32f3/soc_config.c create mode 100644 arch/arm/soc/st_stm32/stm32f3/soc_gpio.c create mode 100644 arch/arm/soc/st_stm32/stm32f3/soc_irq.h create mode 100644 arch/arm/soc/st_stm32/stm32f3/soc_registers.h create mode 100644 boards/arm/cc3200_launchxl/doc/cc3200_launchxl.rst create mode 100644 boards/arm/mps2_an385/Kconfig.board create mode 100644 boards/arm/mps2_an385/Kconfig.defconfig create mode 100644 boards/arm/mps2_an385/Makefile create mode 100644 boards/arm/mps2_an385/board.h create mode 100644 boards/arm/mps2_an385/doc/img/mps2.png create mode 100644 boards/arm/mps2_an385/doc/mps2_an385.rst create mode 100644 boards/arm/mps2_an385/mps2_an385_defconfig create mode 100644 boards/arm/nucleo_f334r8/Kconfig.board create mode 100644 boards/arm/nucleo_f334r8/Kconfig.defconfig create mode 100644 boards/arm/nucleo_f334r8/Makefile create mode 100644 boards/arm/nucleo_f334r8/Makefile.board create mode 100644 boards/arm/nucleo_f334r8/board.h create mode 100644 boards/arm/nucleo_f334r8/nucleo_f334r8_defconfig create mode 100644 boards/arm/nucleo_f334r8/support/openocd.cfg create mode 100644 boards/arm/nucleo_f401re/doc/img/nucleo64_perf_logo_1024.png create mode 100644 boards/arm/nucleo_f401re/doc/img/nucleo_f401re_arduino.png create mode 100644 boards/arm/nucleo_f401re/doc/img/nucleo_f401re_morpho.png create mode 100644 boards/arm/nucleo_f401re/doc/nucleof401re.rst create mode 100644 boards/arm/stm32373c_eval/Kconfig.board create mode 100644 boards/arm/stm32373c_eval/Kconfig.defconfig create mode 100644 boards/arm/stm32373c_eval/Makefile create mode 100644 boards/arm/stm32373c_eval/Makefile.board create mode 100644 boards/arm/stm32373c_eval/board.h create mode 100644 boards/arm/stm32373c_eval/stm32373c_eval_defconfig create mode 100644 boards/arm/stm32373c_eval/support/openocd.cfg create mode 100644 drivers/clock_control/Kconfig.stm32f3x create mode 100644 drivers/clock_control/stm32f3x_clock.c create mode 100644 drivers/counter/Kconfig.dtmr_cmsdk_apb create mode 100644 drivers/counter/counter_dtmr_cmsdk_apb.c create mode 100644 drivers/counter/dualtimer_cmsdk_apb.h create mode 100644 drivers/counter/timer_cmsdk_apb.h create mode 100644 drivers/counter/timer_dtmr_cmsdk_apb.c create mode 100644 drivers/counter/timer_tmr_cmsdk_apb.c create mode 100644 drivers/flash/Kconfig.stm32f3x create mode 100644 drivers/flash/flash_stm32f3x.c create mode 100644 drivers/flash/flash_stm32f3x.h create mode 100644 drivers/flash/flash_stm32f3x_priv.c create mode 100644 drivers/pinmux/stm32/pinmux_board_nucleo_f334r8.c create mode 100644 drivers/pinmux/stm32/pinmux_board_stm3210c_eval.c create mode 100644 drivers/pinmux/stm32/pinmux_board_stm32373c_eval.c create mode 100644 drivers/pinmux/stm32/pinmux_stm32f3.h delete mode 100644 drivers/serial/Kconfig.k20 create mode 100644 drivers/serial/Kconfig.mcux delete mode 100644 drivers/serial/uart_k20.c delete mode 100644 drivers/serial/uart_k20.h delete mode 100644 drivers/serial/uart_k20_priv.h create mode 100644 drivers/serial/uart_mcux.c create mode 100644 drivers/spi/Kconfig.mcux delete mode 100644 drivers/spi/spi_k64.c delete mode 100644 drivers/spi/spi_k64_priv.h create mode 100644 drivers/spi/spi_mcux.c create mode 100644 include/arch/arm/cortex_m/cmsis.h create mode 100644 include/drivers/clock_control/stm32f3_clock_control.h delete mode 100644 include/drivers/spi/spi_k64.h Signed-off-by:Kumar Gala <kumar.gala@linaro.org> Change-Id: I5890c34d63b0d0f0bc8bf443f6ccacae68a53e93 Signed-off-by:
Loading
Please sign in to comment