Skip to content

Commit

Permalink
Merge arm branch into master
Browse files Browse the repository at this point in the history 
Main changes:

- Converted Nordic SoC & Boards to device tree
- Converted TI LM3S6965 SoC & QEMU Cortex M3 board to device tree
- Add support for TI CC3220 SF SoC & CC3220SF-LAUNCHXL board
- Add support for ST DISCO L475 IOT1 board
- Add support for NXP FRDM-KL25Z board
- Converted all dts to use 'current-speed' instead of 'baud-rate'
- Various code cleanups

----------------------------------------------------------------
Erwan Gouriou (12):
      ext: stm32cube: update stm32f1xx cube version
      dts: Align uart "baud-rate" property to device tree spec "current-speed"
      drivers: clock control: Provide LL based clock control for stm32f4 series
      drivers: dma_stm32f4x: make driver compatible with LL Clock Driver
      boards: stm32f4: Provide config for LL Clock control
      soc: stm32f4: Enable LL based clock control
      stm32f4: Clean references to stm32f4 specific clock control
      driver: uart: clock control code refactoring
      driver: clock control stm32: align f4 factor names on l4
      soc: stm32l4xx: add support for STM32L475XG
      board: Add support for board disco_l475_iot1
      boards: disco_l475_iot: Configuration for HTS221 sample

Florian Vaussard (2):
      arm: stm32f4: Reorder Kconfig options
      pinmux: stm32f4: Clean-up pinmux header

Gil Pitney (7):
      cc3200: Make use of mem.h file in soc dtsi file.
      cc3220sf: Add support for the TI CC3220SF SoC
      boards: Add support for the CC3220SF_LAUNCHXL board
      MAINTAINERS: Update maintainer for TI CC3220SF LaunchXL board
      cc3220sf: Update "baud-rate" dts property to "current-speed"
      cc3200: Set warning to deprecate board in Zephyr v1.8
      cc3220sf: Minor board documentation updates

Gustavo Denardin (1):
      arm: Support for new ARM board FRDM-KL25Z

Jon Medhurst (2):
      i2c: bitbang: Add library for software driven I2C
      i2c: i2c_gpio: Driver for software driven I2C using GPIO lines

Kumar Gala (13):
      serial: mcux: Shim driver for LPSCI UART on KL25Z
      arm: nxp: kl2x: Move to using UART_MCUX_LPSCI for UART0
      arm: ti: dts: fixup building CC3200 dts
      arm: soc: ti_lm3s6965: remove dead code
      arm: linker: remove unused linker sections
      arm: dts: nrf: Add Device Tree Support for nRF52832 SoC based boards
      arm: dts: nrf: Fixup nRF52840-QIAA SoC support for device tree
      arm: dts: nrf: Add Device Tree Support for nRF52840 SoC & boards
      arm: dts: nrf: Add Device Tree Support for nRF51822 SoC & boards
      arm: dts: nrf: Remove !HAS_DTS Kconfig bits
      serial: uart_stellaris: remove export of uart_stellaris_isr
      arm: dts: ti_lm3s6965: Add Device Tree Support
      arm: dts: ti_lm3s6965: Add device tree support for Stellaris UART

 .gitreview                                         |    1 +
 MAINTAINERS                                        |    2 +-
 .../nrf51/Kconfig.defconfig.nrf51822_QFAA          |    6 -
 .../nrf51/Kconfig.defconfig.nrf51822_QFAB          |    6 -
 .../nrf51/Kconfig.defconfig.nrf51822_QFAC          |    6 -
 .../soc/nordic_nrf5/nrf51/Kconfig.defconfig.series |   10 -
 .../nrf52/Kconfig.defconfig.nrf52832_QFAA          |    8 -
 .../nrf52/Kconfig.defconfig.nrf52840_QIAA          |    6 -
 .../soc/nordic_nrf5/nrf52/Kconfig.defconfig.series |   12 -
 arch/arm/soc/nxp_kinetis/Kconfig                   |    6 +
 .../soc/nxp_kinetis/kl2x/Kconfig.defconfig.mkl25z4 |    2 +-
 arch/arm/soc/nxp_kinetis/kl2x/Kconfig.soc          |    1 +
 arch/arm/soc/nxp_kinetis/kl2x/soc.c                |    6 +-
 .../soc/st_stm32/stm32f4/Kconfig.defconfig.series  |    2 +-
 arch/arm/soc/st_stm32/stm32f4/Kconfig.soc          |    6 +-
 arch/arm/soc/st_stm32/stm32f4/flash_registers.h    |  107 -
 arch/arm/soc/st_stm32/stm32f4/rcc_registers.h      |  159 -
 arch/arm/soc/st_stm32/stm32f4/soc.c                |    6 +
 arch/arm/soc/st_stm32/stm32f4/soc.h                |    7 +
 arch/arm/soc/st_stm32/stm32f4/soc_gpio.c           |    6 +-
 arch/arm/soc/st_stm32/stm32f4/soc_registers.h      |    1 -
 .../st_stm32/stm32l4/Kconfig.defconfig.stm32l475xg |   18 +
 arch/arm/soc/st_stm32/stm32l4/Kconfig.soc          |    4 +
 arch/arm/soc/ti_lm3s6965/Kconfig.defconfig         |   30 -
 arch/arm/soc/ti_lm3s6965/Makefile                  |    1 -
 arch/arm/soc/ti_lm3s6965/scp.c                     |   44 -
 arch/arm/soc/ti_lm3s6965/scp.h                     |  164 -
 arch/arm/soc/ti_lm3s6965/soc.h                     |   12 -
 .../cc32xx/Kconfig.defconfig.cc3220sf              |   43 +
 arch/arm/soc/ti_simplelink/cc32xx/Kconfig.soc      |   15 +
 arch/arm/soc/ti_simplelink/cc32xx/README           |   10 +-
 arch/arm/soc/ti_simplelink/cc32xx/soc.c            |    6 +-
 boards/arm/96b_carbon/96b_carbon_defconfig         |   23 +-
 boards/arm/96b_nitrogen/96b_nitrogen_defconfig     |    3 +
 .../arm/arduino_101_ble/arduino_101_ble_defconfig  |    3 +
 boards/arm/bbc_microbit/bbc_microbit_defconfig     |    3 +
 boards/arm/cc3200_launchxl/Kconfig.defconfig       |    3 +
 boards/arm/cc3220sf_launchxl/Kconfig.board         |    6 +
 boards/arm/cc3220sf_launchxl/Kconfig.defconfig     |    9 +
 boards/arm/cc3220sf_launchxl/Makefile              |    4 +
 boards/arm/cc3220sf_launchxl/board.h               |   25 +
 .../cc3220sf_launchxl/cc3220sf_launchxl_defconfig  |   28 +
 boards/arm/cc3220sf_launchxl/dbghdr.c              |   24 +
 .../cc3220sf_launchxl/doc/cc3220sf_launchxl.rst    |  222 +
 boards/arm/cc3220sf_launchxl/pinmux.c              |  121 +
 .../arm/cc3220sf_launchxl/support/CC3220SF.ccxml   |   14 +
 .../cc3220sf_launchxl/support/cc3220_xds110.cfg    |   45 +
 .../arm/cc3220sf_launchxl/support/gdbinit_xds110   |   16 +
 boards/arm/curie_ble/curie_ble_defconfig           |    3 +
 boards/arm/disco_l475_iot1/Kconfig.board           |   10 +
 boards/arm/disco_l475_iot1/Kconfig.defconfig       |   90 +
 boards/arm/disco_l475_iot1/Makefile                |    2 +
 boards/arm/disco_l475_iot1/board.h                 |   41 +
 .../arm/disco_l475_iot1/disco_l475_iot1_defconfig  |   58 +
 boards/arm/disco_l475_iot1/doc/disco_l475_iot1.rst |  245 +
 .../disco_l475_iot1/doc/img/disco_l475_iot1.jpg    |  Bin 0 -> 1471155 bytes
 boards/arm/frdm_kl25z/Kconfig.board                |   11 +
 boards/arm/frdm_kl25z/Kconfig.defconfig            |  108 +
 boards/arm/frdm_kl25z/Makefile                     |   10 +
 boards/arm/frdm_kl25z/board.h                      |   44 +
 boards/arm/frdm_kl25z/doc/frdm_kl25z.jpg           |  Bin 0 -> 15127 bytes
 boards/arm/frdm_kl25z/doc/frdm_kl25z.rst           |  173 +
 boards/arm/frdm_kl25z/frdm_kl25z_defconfig         |   12 +
 boards/arm/frdm_kl25z/pinmux.c                     |   70 +
 boards/arm/nrf51_blenano/nrf51_blenano_defconfig   |    3 +
 boards/arm/nrf51_pca10028/nrf51_pca10028_defconfig |    3 +
 .../nrf52840_pca10056/nrf52840_pca10056_defconfig  |    3 +
 boards/arm/nrf52_blenano2/nrf52_blenano2_defconfig |    3 +
 boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig |    3 +
 boards/arm/nucleo_f401re/nucleo_f401re_defconfig   |   24 +-
 boards/arm/nucleo_f411re/nucleo_f411re_defconfig   |   25 +-
 boards/arm/qemu_cortex_m3/qemu_cortex_m3_defconfig |    3 +-
 .../quark_se_c1000_ble_defconfig                   |    3 +
 drivers/clock_control/Kconfig                      |    2 -
 drivers/clock_control/Kconfig.stm32                |   46 +
 drivers/clock_control/Kconfig.stm32f4x             |  141 -
 drivers/clock_control/Makefile                     |    2 +-
 drivers/clock_control/stm32_ll_clock.c             |    9 +
 drivers/clock_control/stm32_ll_clock.h             |    1 +
 drivers/clock_control/stm32f3x_ll_clock.c          |    8 +
 drivers/clock_control/stm32f4x_clock.c             |  350 --
 drivers/clock_control/stm32f4x_ll_clock.c          |   52 +
 drivers/clock_control/stm32l4x_ll_clock.c          |    8 +
 drivers/dma/dma_stm32f4x.c                         |   11 +-
 drivers/gpio/gpio_stm32.c                          |   35 +-
 drivers/gpio/gpio_stm32.h                          |    6 +-
 drivers/i2c/Kconfig                                |    8 +
 drivers/i2c/Kconfig.gpio                           |  158 +
 drivers/i2c/Makefile                               |    2 +
 drivers/i2c/i2c_bitbang.c                          |  279 ++
 drivers/i2c/i2c_bitbang.h                          |   57 +
 drivers/i2c/i2c_gpio.c                             |  149 +
 drivers/pinmux/Makefile                            |    1 +
 .../pinmux/stm32/pinmux_board_disco_l475_iot1.c    |   64 +
 drivers/pinmux/stm32/pinmux_stm32.c                |   21 +-
 drivers/pinmux/stm32/pinmux_stm32f4.h              |   14 +-
 drivers/pwm/pwm_stm32.c                            |   43 +-
 drivers/pwm/pwm_stm32.h                            |    4 -
 drivers/serial/Kconfig                             |    2 +
 drivers/serial/Kconfig.mcux_lpsci                  |   32 +
 drivers/serial/Kconfig.stellaris                   |   48 -
 drivers/serial/Makefile                            |    1 +
 drivers/serial/uart_cc32xx.c                       |    2 +-
 drivers/serial/uart_mcux_lpsci.c                   |  308 ++
 drivers/serial/uart_stellaris.c                    |   34 +-
 drivers/serial/uart_stellaris.h                    |   16 -
 drivers/serial/uart_stm32.c                        |   21 +-
 drivers/serial/uart_stm32.h                        |    4 -
 dts/arm/96b_carbon.dts                             |    4 +-
 dts/arm/96b_carbon.fixup                           |    5 +-
 dts/arm/96b_nitrogen.dts                           |   26 +
 dts/arm/96b_nitrogen.fixup                         |    3 +
 dts/arm/Makefile                                   |   14 +
 dts/arm/arduino_101_ble.dts                        |   25 +
 dts/arm/arduino_101_ble.fixup                      |    3 +
 dts/arm/bbc_microbit.dts                           |   24 +
 dts/arm/bbc_microbit.fixup                         |    3 +
 dts/arm/cc3200_launchxl.dts                        |    5 +-
 dts/arm/cc3220sf_launchxl.dts                      |   23 +
 dts/arm/cc3220sf_launchxl.fixup                    |    1 +
 dts/arm/curie_ble.dts                              |   25 +
 dts/arm/curie_ble.fixup                            |    3 +
 dts/arm/disco_l475_iot1.dts                        |   24 +
 dts/arm/disco_l475_iot1.fixup                      |   32 +
 dts/arm/frdm_k64f.dts                              |    4 +-
 dts/arm/frdm_k64f.fixup                            |   12 +-
 dts/arm/frdm_kl25z.dts                             |   23 +
 dts/arm/frdm_kl25z.fixup                           |    1 +
 dts/arm/frdm_kw41z.dts                             |    1 +
 dts/arm/frdm_kw41z.fixup                           |    2 +-
 dts/arm/hexiwear_k64.dts                           |    4 +-
 dts/arm/hexiwear_k64.fixup                         |   12 +-
 dts/arm/hexiwear_kw40z.dts                         |    2 +-
 dts/arm/hexiwear_kw40z.fixup                       |    2 +-
 dts/arm/nordic/nrf51822.dtsi                       |   31 +
 dts/arm/nordic/nrf52840.dtsi                       |   38 +
 dts/arm/nrf51_blenano.dts                          |   25 +
 dts/arm/nrf51_blenano.fixup                        |    3 +
 dts/arm/nrf51_pca10028.dts                         |   25 +
 dts/arm/nrf51_pca10028.fixup                       |    3 +
 dts/arm/nrf52840_pca10056.dts                      |   26 +
 dts/arm/nrf52840_pca10056.fixup                    |    3 +
 dts/arm/nrf52_blenano2.dts                         |   26 +
 dts/arm/nrf52_blenano2.fixup                       |    3 +
 dts/arm/nrf52_pca10040.dts                         |   26 +
 dts/arm/nrf52_pca10040.fixup                       |    3 +
 dts/arm/nucleo_f103rb.dts                          |    2 +-
 dts/arm/nucleo_f103rb.fixup                        |    2 +-
 dts/arm/nucleo_f334r8.dts                          |    2 +-
 dts/arm/nucleo_f334r8.fixup                        |    2 +-
 dts/arm/nucleo_f401re.dts                          |    4 +-
 dts/arm/nucleo_f401re.fixup                        |    5 +-
 dts/arm/nucleo_f411re.dts                          |    4 +-
 dts/arm/nucleo_f411re.fixup                        |    5 +-
 dts/arm/nucleo_l476rg.dts                          |    2 +-
 dts/arm/nucleo_l476rg.fixup                        |   10 +-
 dts/arm/nxp/nxp_kl25z.dtsi                         |   32 +
 dts/arm/nxp/nxp_kw41z.dtsi                         |    1 -
 dts/arm/olimexino_stm32.dts                        |    2 +-
 dts/arm/olimexino_stm32.fixup                      |    6 +-
 dts/arm/qemu_cortex_m3.dts                         |   34 +
 dts/arm/qemu_cortex_m3.fixup                       |    1 +
 dts/arm/quark_se_c1000_ble.dts                     |   25 +
 dts/arm/quark_se_c1000_ble.fixup                   |    3 +
 dts/arm/st/mem.h                                   |    3 +
 dts/arm/st/stm32l475.dtsi                          |   59 +
 dts/arm/st/stm32l476.dtsi                          |   54 +-
 dts/arm/stm3210c_eval.dts                          |    2 +-
 dts/arm/stm3210c_eval.fixup                        |    2 +-
 dts/arm/stm32373c_eval.dts                         |    2 +-
 dts/arm/stm32373c_eval.fixup                       |    2 +-
 dts/arm/stm32_mini_a15.dts                         |    2 +-
 dts/arm/stm32_mini_a15.fixup                       |    2 +-
 dts/arm/ti/{cc32xx_launchxl.dtsi => cc32xx.dtsi}   |   15 +-
 dts/arm/ti/lm3s6965.dtsi                           |   45 +
 dts/arm/ti/mem.h                                   |   19 +
 dts/arm/v2m_beetle.dts                             |    4 +-
 dts/arm/v2m_beetle.fixup                           |    4 +-
 dts/arm/yaml/nxp,kinetis-lpsci.yaml                |   31 +
 dts/arm/yaml/ti,stellaris-uart.yaml                |   30 +
 dts/common/yaml/uart.yaml                          |    2 +-
 ext/hal/nxp/mcux/drivers/Makefile                  |    1 +
 ext/hal/st/stm32cube/Kbuild                        |    1 +
 ext/hal/st/stm32cube/stm32f1xx/README              |    6 +-
 .../drivers/include/Legacy/stm32_hal_legacy.h      |  254 +-
 .../drivers/include/stm32_assert_template.h        |   75 +
 .../stm32f1xx/drivers/include/stm32f1xx_hal.h      |   67 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_adc.h  |  148 +-
 .../drivers/include/stm32f1xx_hal_adc_ex.h         |  127 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_can.h  |  445 +-
 .../drivers/include/stm32f1xx_hal_can_ex.h         |   13 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_cec.h  |  325 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_conf.h |  144 +-
 .../drivers/include/stm32f1xx_hal_cortex.h         |  266 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_crc.h  |   14 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_dac.h  |   42 +-
 .../drivers/include/stm32f1xx_hal_dac_ex.h         |   20 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_def.h  |   54 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_dma.h  |  259 +-
 .../drivers/include/stm32f1xx_hal_dma_ex.h         |   51 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_eth.h  |  946 ++--
 .../drivers/include/stm32f1xx_hal_flash.h          |   40 +-
 .../drivers/include/stm32f1xx_hal_flash_ex.h       |  304 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_gpio.h |  178 +-
 .../drivers/include/stm32f1xx_hal_gpio_ex.h        |   85 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_hcd.h  |   22 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_i2c.h  |  600 +--
 .../stm32f1xx/drivers/include/stm32f1xx_hal_i2s.h  |  254 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_irda.h |  366 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_iwdg.h |  235 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_mmc.h  |  718 +++
 .../stm32f1xx/drivers/include/stm32f1xx_hal_nand.h |  249 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_nor.h  |   18 +-
 .../drivers/include/stm32f1xx_hal_pccard.h         |   29 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_pcd.h  |  120 +-
 .../drivers/include/stm32f1xx_hal_pcd_ex.h         |    4 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_pwr.h  |   20 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_rcc.h  |  494 +-
 .../drivers/include/stm32f1xx_hal_rcc_ex.h         |  152 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_rtc.h  |   52 +-
 .../drivers/include/stm32f1xx_hal_rtc_ex.h         |  104 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_sd.h   |  646 +--
 .../drivers/include/stm32f1xx_hal_smartcard.h      |  458 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_spi.h  |  483 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_sram.h |   14 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_tim.h  |  362 +-
 .../drivers/include/stm32f1xx_hal_tim_ex.h         |   47 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_uart.h |  504 ++-
 .../drivers/include/stm32f1xx_hal_usart.h          |  400 +-
 .../stm32f1xx/drivers/include/stm32f1xx_hal_wwdg.h |  177 +-
 .../stm32f1xx/drivers/include/stm32f1xx_ll_adc.h   | 3950 ++++++++++++++++
 .../stm32f1xx/drivers/include/stm32f1xx_ll_bus.h   | 1033 +++++
 .../drivers/include/stm32f1xx_ll_cortex.h          |  658 +++
 .../stm32f1xx/drivers/include/stm32f1xx_ll_crc.h   |  212 +
 .../stm32f1xx/drivers/include/stm32f1xx_ll_dac.h   | 1349 ++++++
 .../stm32f1xx/drivers/include/stm32f1xx_ll_dma.h   | 1978 ++++++++
 .../stm32f1xx/drivers/include/stm32f1xx_ll_exti.h  |  906 ++++
 .../stm32f1xx/drivers/include/stm32f1xx_ll_fsmc.h  |  812 ++--
 .../stm32f1xx/drivers/include/stm32f1xx_ll_gpio.h  | 2381 ++++++++++
 .../stm32f1xx/drivers/include/stm32f1xx_ll_i2c.h   | 1802 ++++++++
 .../stm32f1xx/drivers/include/stm32f1xx_ll_iwdg.h  |  329 ++
 .../stm32f1xx/drivers/include/stm32f1xx_ll_pwr.h   |  458 ++
 .../stm32f1xx/drivers/include/stm32f1xx_ll_rcc.h   | 2309 ++++++++++
 .../stm32f1xx/drivers/include/stm32f1xx_ll_rtc.h   | 1021 +++++
 .../stm32f1xx/drivers/include/stm32f1xx_ll_sdmmc.h |  467 +-
 .../stm32f1xx/drivers/include/stm32f1xx_ll_spi.h   | 1922 ++++++++
 .../drivers/include/stm32f1xx_ll_system.h          |  592 +++
 .../stm32f1xx/drivers/include/stm32f1xx_ll_tim.h   | 3837 ++++++++++++++++
 .../stm32f1xx/drivers/include/stm32f1xx_ll_usart.h | 2589 +++++++++++
 .../stm32f1xx/drivers/include/stm32f1xx_ll_usb.h   |    4 +-
 .../stm32f1xx/drivers/include/stm32f1xx_ll_utils.h |  284 ++
 .../stm32f1xx/drivers/include/stm32f1xx_ll_wwdg.h  |  342 ++
 .../stm32f1xx/drivers/src/stm32f1xx_hal.c          |  106 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_adc.c      |   52 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_adc_ex.c   |  104 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_can.c      |  988 ++--
 .../stm32f1xx/drivers/src/stm32f1xx_hal_cec.c      |  722 +--
 .../stm32f1xx/drivers/src/stm32f1xx_hal_cortex.c   |  199 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_crc.c      |   15 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_dac.c      |   12 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_dac_ex.c   |   16 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_dma.c      |  734 +--
 .../stm32f1xx/drivers/src/stm32f1xx_hal_eth.c      |  347 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_flash.c    |  170 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_flash_ex.c |   77 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_gpio.c     |  130 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_gpio_ex.c  |    4 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_hcd.c      |  125 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_i2c.c      | 4184 +++++++++++------
 .../stm32f1xx/drivers/src/stm32f1xx_hal_i2s.c      |  986 ++--
 .../stm32f1xx/drivers/src/stm32f1xx_hal_irda.c     | 1708 ++++---
 .../stm32f1xx/drivers/src/stm32f1xx_hal_iwdg.c     |  316 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_mmc.c      | 2598 +++++++++++
 .../drivers/src/stm32f1xx_hal_msp_template.c       |    4 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_nand.c     | 1075 ++++-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_nor.c      |   38 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_pccard.c   |   54 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_pcd.c      |  258 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_pcd_ex.c   |   30 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_pwr.c      |   33 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_rcc.c      |  109 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_rcc_ex.c   |  139 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_rtc.c      |  210 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_rtc_ex.c   |   31 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_sd.c       | 4762 +++++++++-----------
 .../drivers/src/stm32f1xx_hal_smartcard.c          | 1853 +++++---
 .../stm32f1xx/drivers/src/stm32f1xx_hal_spi.c      | 3632 +++++++++------
 .../stm32f1xx/drivers/src/stm32f1xx_hal_spi_ex.c   |   54 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_sram.c     |   16 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_tim.c      |  236 +-
 .../stm32f1xx/drivers/src/stm32f1xx_hal_tim_ex.c   |   46 +-
 .../stm32f1xx_hal_timebase_rtc_alarm_template.c    |  307 ++
 .../src/stm32f1xx_hal_timebase_tim_template.c      |  184 +
 .../stm32f1xx/drivers/src/stm32f1xx_hal_uart.c     | 1703 ++++---
 .../stm32f1xx/drivers/src/stm32f1xx_hal_usart.c    | 1265 ++++--
 .../stm32f1xx/drivers/src/stm32f1xx_hal_wwdg.c     |  390 +-
 .../stm32f1xx/drivers/src/stm32f1xx_ll_adc.c       |  903 ++++
 .../stm32f1xx/drivers/src/stm32f1xx_ll_crc.c       |  126 +
 .../stm32f1xx/drivers/src/stm32f1xx_ll_dac.c       |  274 ++
 .../stm32f1xx/drivers/src/stm32f1xx_ll_dma.c       |  331 ++
 .../stm32f1xx/drivers/src/stm32f1xx_ll_exti.c      |  232 +
 .../stm32f1xx/drivers/src/stm32f1xx_ll_fsmc.c      |  362 +-
 .../stm32f1xx/drivers/src/stm32f1xx_ll_gpio.c      |  265 ++
 .../stm32f1xx/drivers/src/stm32f1xx_ll_i2c.c       |  239 +
 .../stm32f1xx/drivers/src/stm32f1xx_ll_pwr.c       |  103 +
 .../stm32f1xx/drivers/src/stm32f1xx_ll_rcc.c       |  507 +++
 .../stm32f1xx/drivers/src/stm32f1xx_ll_rtc.c       |  558 +++
 .../stm32f1xx/drivers/src/stm32f1xx_ll_sdmmc.c     | 1184 ++++-
 .../stm32f1xx/drivers/src/stm32f1xx_ll_spi.c       |  562 +++
 .../stm32f1xx/drivers/src/stm32f1xx_ll_tim.c       | 1216 +++++
 .../stm32f1xx/drivers/src/stm32f1xx_ll_usart.c     |  451 ++
 .../stm32f1xx/drivers/src/stm32f1xx_ll_usb.c       |  167 +-
 .../stm32f1xx/drivers/src/stm32f1xx_ll_utils.c     |  623 +++
 ext/hal/st/stm32cube/stm32f1xx/soc/stm32f100xb.h   |  962 ++--
 ext/hal/st/stm32cube/stm32f1xx/soc/stm32f100xe.h   | 1032 ++---
 ext/hal/st/stm32cube/stm32f1xx/soc/stm32f101x6.h   |  839 +---
 ext/hal/st/stm32cube/stm32f1xx/soc/stm32f101xb.h   |  847 +---
 ext/hal/st/stm32cube/stm32f1xx/soc/stm32f101xe.h   |  966 ++--
 ext/hal/st/stm32cube/stm32f1xx/soc/stm32f101xg.h   | 1045 ++---
 ext/hal/st/stm32cube/stm32f1xx/soc/stm32f102x6.h   | 1187 ++---
 ext/hal/st/stm32cube/stm32f1xx/soc/stm32f102xb.h   | 1191 ++---
 ext/hal/st/stm32cube/stm32f1xx/soc/stm32f103x6.h   | 1215 ++---
 ext/hal/st/stm32cube/stm32f1xx/soc/stm32f103xb.h   | 1235 ++---
 ext/hal/st/stm32cube/stm32f1xx/soc/stm32f103xe.h   | 1348 ++----
 ext/hal/st/stm32cube/stm32f1xx/soc/stm32f103xg.h   | 1370 ++----
 ext/hal/st/stm32cube/stm32f1xx/soc/stm32f105xc.h   |  989 ++--
 ext/hal/st/stm32cube/stm32f1xx/soc/stm32f107xc.h   | 1135 ++---
 ext/hal/st/stm32cube/stm32f1xx/soc/stm32f1xx.h     |   12 +-
 .../st/stm32cube/stm32f1xx/soc/system_stm32f1xx.c  |  112 +-
 .../st/stm32cube/stm32f1xx/soc/system_stm32f1xx.h  |   10 +-
 include/arch/arm/cortex_m/scripts/linker.ld        |   35 +-
 .../drivers/clock_control/stm32_clock_control.h    |    2 -
 .../drivers/clock_control/stm32f4_clock_control.h  |  134 -
 include/section_tags.h                             |    1 -
 include/sections.h                                 |    2 -
 scripts/sanity_chk/arches/arm.ini                  |    3 +-
 tests/kernel/xip/testcase.ini                      |    2 +-
 337 files changed, 69436 insertions(+), 29054 deletions(-)
 delete mode 100644 arch/arm/soc/st_stm32/stm32f4/rcc_registers.h
 create mode 100644 arch/arm/soc/st_stm32/stm32l4/Kconfig.defconfig.stm32l475xg
 delete mode 100644 arch/arm/soc/ti_lm3s6965/scp.c
 delete mode 100644 arch/arm/soc/ti_lm3s6965/scp.h
 create mode 100644 arch/arm/soc/ti_simplelink/cc32xx/Kconfig.defconfig.cc3220sf
 create mode 100644 boards/arm/cc3220sf_launchxl/Kconfig.board
 create mode 100644 boards/arm/cc3220sf_launchxl/Kconfig.defconfig
 create mode 100644 boards/arm/cc3220sf_launchxl/Makefile
 create mode 100644 boards/arm/cc3220sf_launchxl/board.h
 create mode 100644 boards/arm/cc3220sf_launchxl/cc3220sf_launchxl_defconfig
 create mode 100644 boards/arm/cc3220sf_launchxl/dbghdr.c
 create mode 100644 boards/arm/cc3220sf_launchxl/doc/cc3220sf_launchxl.rst
 create mode 100644 boards/arm/cc3220sf_launchxl/pinmux.c
 create mode 100644 boards/arm/cc3220sf_launchxl/support/CC3220SF.ccxml
 create mode 100644 boards/arm/cc3220sf_launchxl/support/cc3220_xds110.cfg
 create mode 100644 boards/arm/cc3220sf_launchxl/support/gdbinit_xds110
 create mode 100644 boards/arm/disco_l475_iot1/Kconfig.board
 create mode 100644 boards/arm/disco_l475_iot1/Kconfig.defconfig
 create mode 100644 boards/arm/disco_l475_iot1/Makefile
 create mode 100644 boards/arm/disco_l475_iot1/board.h
 create mode 100644 boards/arm/disco_l475_iot1/disco_l475_iot1_defconfig
 create mode 100644 boards/arm/disco_l475_iot1/doc/disco_l475_iot1.rst
 create mode 100644 boards/arm/disco_l475_iot1/doc/img/disco_l475_iot1.jpg
 create mode 100644 boards/arm/frdm_kl25z/Kconfig.board
 create mode 100644 boards/arm/frdm_kl25z/Kconfig.defconfig
 create mode 100644 boards/arm/frdm_kl25z/Makefile
 create mode 100644 boards/arm/frdm_kl25z/board.h
 create mode 100644 boards/arm/frdm_kl25z/doc/frdm_kl25z.jpg
 create mode 100644 boards/arm/frdm_kl25z/doc/frdm_kl25z.rst
 create mode 100644 boards/arm/frdm_kl25z/frdm_kl25z_defconfig
 create mode 100644 boards/arm/frdm_kl25z/pinmux.c
 delete mode 100644 drivers/clock_control/Kconfig.stm32f4x
 delete mode 100644 drivers/clock_control/stm32f4x_clock.c
 create mode 100644 drivers/clock_control/stm32f4x_ll_clock.c
 create mode 100644 drivers/i2c/Kconfig.gpio
 create mode 100644 drivers/i2c/i2c_bitbang.c
 create mode 100644 drivers/i2c/i2c_bitbang.h
 create mode 100644 drivers/i2c/i2c_gpio.c
 create mode 100644 drivers/pinmux/stm32/pinmux_board_disco_l475_iot1.c
 create mode 100644 drivers/serial/Kconfig.mcux_lpsci
 create mode 100644 drivers/serial/uart_mcux_lpsci.c
 delete mode 100644 drivers/serial/uart_stellaris.h
 create mode 100644 dts/arm/96b_nitrogen.dts
 create mode 100644 dts/arm/96b_nitrogen.fixup
 create mode 100644 dts/arm/arduino_101_ble.dts
 create mode 100644 dts/arm/arduino_101_ble.fixup
 create mode 100644 dts/arm/bbc_microbit.dts
 create mode 100644 dts/arm/bbc_microbit.fixup
 create mode 100644 dts/arm/cc3220sf_launchxl.dts
 create mode 100644 dts/arm/cc3220sf_launchxl.fixup
 create mode 100644 dts/arm/curie_ble.dts
 create mode 100644 dts/arm/curie_ble.fixup
 create mode 100644 dts/arm/disco_l475_iot1.dts
 create mode 100644 dts/arm/disco_l475_iot1.fixup
 create mode 100644 dts/arm/frdm_kl25z.dts
 create mode 100644 dts/arm/frdm_kl25z.fixup
 create mode 100644 dts/arm/nordic/nrf51822.dtsi
 create mode 100644 dts/arm/nordic/nrf52840.dtsi
 create mode 100644 dts/arm/nrf51_blenano.dts
 create mode 100644 dts/arm/nrf51_blenano.fixup
 create mode 100644 dts/arm/nrf51_pca10028.dts
 create mode 100644 dts/arm/nrf51_pca10028.fixup
 create mode 100644 dts/arm/nrf52840_pca10056.dts
 create mode 100644 dts/arm/nrf52840_pca10056.fixup
 create mode 100644 dts/arm/nrf52_blenano2.dts
 create mode 100644 dts/arm/nrf52_blenano2.fixup
 create mode 100644 dts/arm/nrf52_pca10040.dts
 create mode 100644 dts/arm/nrf52_pca10040.fixup
 create mode 100644 dts/arm/nxp/nxp_kl25z.dtsi
 create mode 100644 dts/arm/qemu_cortex_m3.dts
 create mode 100644 dts/arm/qemu_cortex_m3.fixup
 create mode 100644 dts/arm/quark_se_c1000_ble.dts
 create mode 100644 dts/arm/quark_se_c1000_ble.fixup
 create mode 100644 dts/arm/st/stm32l475.dtsi
 rename dts/arm/ti/{cc32xx_launchxl.dtsi => cc32xx.dtsi} (78%)
 create mode 100644 dts/arm/ti/lm3s6965.dtsi
 create mode 100644 dts/arm/ti/mem.h
 create mode 100644 dts/arm/yaml/nxp,kinetis-lpsci.yaml
 create mode 100644 dts/arm/yaml/ti,stellaris-uart.yaml
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/include/stm32_assert_template.h
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/include/stm32f1xx_hal_mmc.h
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/include/stm32f1xx_ll_adc.h
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/include/stm32f1xx_ll_bus.h
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/include/stm32f1xx_ll_cortex.h
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/include/stm32f1xx_ll_crc.h
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/include/stm32f1xx_ll_dac.h
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/include/stm32f1xx_ll_dma.h
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/include/stm32f1xx_ll_exti.h
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/include/stm32f1xx_ll_gpio.h
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/include/stm32f1xx_ll_i2c.h
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/include/stm32f1xx_ll_iwdg.h
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/include/stm32f1xx_ll_pwr.h
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/include/stm32f1xx_ll_rcc.h
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/include/stm32f1xx_ll_rtc.h
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/include/stm32f1xx_ll_spi.h
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/include/stm32f1xx_ll_system.h
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/include/stm32f1xx_ll_tim.h
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/include/stm32f1xx_ll_usart.h
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/include/stm32f1xx_ll_utils.h
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/include/stm32f1xx_ll_wwdg.h
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/src/stm32f1xx_hal_mmc.c
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/src/stm32f1xx_hal_timebase_rtc_alarm_template.c
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/src/stm32f1xx_hal_timebase_tim_template.c
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/src/stm32f1xx_ll_adc.c
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/src/stm32f1xx_ll_crc.c
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/src/stm32f1xx_ll_dac.c
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/src/stm32f1xx_ll_dma.c
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/src/stm32f1xx_ll_exti.c
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/src/stm32f1xx_ll_gpio.c
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/src/stm32f1xx_ll_i2c.c
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/src/stm32f1xx_ll_pwr.c
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/src/stm32f1xx_ll_rcc.c
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/src/stm32f1xx_ll_rtc.c
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/src/stm32f1xx_ll_spi.c
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/src/stm32f1xx_ll_tim.c
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/src/stm32f1xx_ll_usart.c
 create mode 100644 ext/hal/st/stm32cube/stm32f1xx/drivers/src/stm32f1xx_ll_utils.c
 delete mode 100644 include/drivers/clock_control/stm32f4_clock_control.h

Change-Id: I0a465f75ff94c33373c03951b4d7468476bc3b41
Signed-off-by: Kumar Gala <[email protected]>
  • Loading branch information
@galak
galak committed Apr 28, 2017
2 parents cc93ace + ac0bb05 commit 3d3adc8
Show file tree
Hide file tree
Showing 337 changed files with 69,436 additions and 29,054 deletions.
1 change: 1 addition & 0 deletions .gitreview
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
host=gerrit.zephyrproject.org
port=29418
project=zephyr.git
defaultremote=origin
2 changes: 1 addition & 1 deletion MAINTAINERS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ BOARDS/ARM - CC32XX LAUNCHXL
M: Gil Pitney <[email protected]>
S: Supported
F: boards/arm/cc3200_launchxl/
F: boards/arm/cc3220s_launchxl/
F: boards/arm/cc3220sf_launchxl/

BOARDS/ARM - NXP FRDM-K64F
M: Maureen Helm <[email protected]>
Expand Down
6 changes: 0 additions & 6 deletions arch/arm/soc/nordic_nrf5/nrf51/Kconfig.defconfig.nrf51822_QFAA
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@ config SOC
string
default nRF51822_QFAA

config SRAM_SIZE
default 16

config FLASH_SIZE
default 256

config ISR_STACK_SIZE
default 640

Expand Down
6 changes: 0 additions & 6 deletions arch/arm/soc/nordic_nrf5/nrf51/Kconfig.defconfig.nrf51822_QFAB
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@ config SOC
string
default nRF51822_QFAB

config SRAM_SIZE
default 16

config FLASH_SIZE
default 128

config ISR_STACK_SIZE
default 640

Expand Down
6 changes: 0 additions & 6 deletions arch/arm/soc/nordic_nrf5/nrf51/Kconfig.defconfig.nrf51822_QFAC
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,4 @@ config SOC
string
default nRF51822_QFAC

config SRAM_SIZE
default 32

config FLASH_SIZE
default 256

endif # SOC_NRF51822_QFAC
10 changes: 0 additions & 10 deletions arch/arm/soc/nordic_nrf5/nrf51/Kconfig.defconfig.series
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,10 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
config SYS_POWER_MANAGEMENT
default y

config SRAM_BASE_ADDRESS
default 0x20000000

config FLASH_BASE_ADDRESS
default 0x00000000

config NUM_IRQS
int
default 26

config NUM_IRQ_PRIO_BITS
int
default 2

if SENSOR

config TEMP_NRF5
Expand Down
8 changes: 0 additions & 8 deletions arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52832_QFAA
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,6 @@ config SOC
string
default nRF52832_QFAA

if !HAS_DTS
config SRAM_SIZE
default 64

config FLASH_SIZE
default 512
endif

config NUM_IRQS
int
default 39
Expand Down
6 changes: 0 additions & 6 deletions arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.nrf52840_QIAA
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@ config SOC
string
default nRF52840_QIAA

config SRAM_SIZE
default 256

config FLASH_SIZE
default 1024

config NUM_IRQS
int
default 46
Expand Down
12 changes: 0 additions & 12 deletions arch/arm/soc/nordic_nrf5/nrf52/Kconfig.defconfig.series
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,4 @@ config SYS_CLOCK_HW_CYCLES_PER_SEC
config SYS_POWER_MANAGEMENT
default y

if !HAS_DTS
config SRAM_BASE_ADDRESS
default 0x20000000

config FLASH_BASE_ADDRESS
default 0x00000000

config NUM_IRQ_PRIO_BITS
int
default 3
endif

endif # SOC_SERIES_NRF52X
6 changes: 6 additions & 0 deletions arch/arm/soc/nxp_kinetis/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ config HAS_LPUART
help
Set if the low power uart (LPUART) module is present in the SoC.

config HAS_LPSCI
bool
default n
help
Set if the low power uart (LPSCI) module is present in the SoC.

if HAS_OSC

choice
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/soc/nxp_kinetis/kl2x/Kconfig.defconfig.mkl25z4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ endif # GPIO

if SERIAL

config UART_MCUX
config UART_MCUX_LPSCI
def_bool y

endif # SERIAL
Expand Down
1 change: 1 addition & 0 deletions arch/arm/soc/nxp_kinetis/kl2x/Kconfig.soc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ config SOC_MKL25Z4
select HAS_MCUX
select HAS_OSC
select HAS_MCG
select HAS_LPSCI

endchoice

Expand Down
6 changes: 4 additions & 2 deletions arch/arm/soc/nxp_kinetis/kl2x/soc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
#include <fsl_clock.h>
#include <arch/cpu.h>

#define LPSCI0SRC_MCGFLLCLK (1)

/*******************************************************************************
* Variables
******************************************************************************/
Expand Down Expand Up @@ -93,8 +95,8 @@ static ALWAYS_INLINE void clkInit(void)
CLOCK_SetInternalRefClkConfig(kMCG_IrclkEnable, kMCG_IrcSlow, 0);
CLOCK_SetSimConfig(&simConfig);

#ifdef CONFIG_UART_MCUX_0
CLOCK_SetLpsci0Clock(1);
#ifdef CONFIG_UART_MCUX_LPSCI_0
CLOCK_SetLpsci0Clock(LPSCI0SRC_MCGFLLCLK);
#endif
}

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/soc/st_stm32/stm32f4/Kconfig.defconfig.series
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ endif #SERIAL

if CLOCK_CONTROL

config CLOCK_CONTROL_STM32F4X
config CLOCK_CONTROL_STM32_CUBE
def_bool y

endif #CLOCK_CONTROL
Expand Down
6 changes: 3 additions & 3 deletions arch/arm/soc/st_stm32/stm32f4/Kconfig.soc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ depends on SOC_SERIES_STM32F4X
config SOC_STM32F401XE
bool "STM32F401XE"

config SOC_STM32F411XE
bool "STM32F411XE"

config SOC_STM32F407XX
bool "STM32F407XX"

config SOC_STM32F411XE
bool "STM32F411XE"

config SOC_STM32F429XX
bool "STM32F429XX"

Expand Down
107 changes: 0 additions & 107 deletions arch/arm/soc/st_stm32/stm32f4/flash_registers.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,6 @@
* Chapter 3.4: Embedded Flash Memory
*/

enum {
STM32F4X_FLASH_LATENCY_0 = 0x0,
STM32F4X_FLASH_LATENCY_1 = 0x1,
STM32F4X_FLASH_LATENCY_2 = 0x2,
STM32F4X_FLASH_LATENCY_3 = 0x3,
STM32F4X_FLASH_LATENCY_4 = 0x4,
STM32F4X_FLASH_LATENCY_5 = 0x5,
};

union __flash_acr {
u32_t val;
struct {
Expand All @@ -48,102 +39,4 @@ struct stm32f4x_flash {
volatile u32_t optctrl;
};

/**
* @brief setup embedded flash controller
*
* Configure flash access time latency (wait states) depending on
* SYSCLK. This code assumes that we're using a supply voltage of
* 2.7V or higher, for lower voltages this code must be changed.
*
* The following tables show the required latency value required for a
* certain CPU frequency (HCLK) and supply voltage. See the section
* "Relation between CPU clock frequency and Flash memory read time"
* in the reference manual for more information.
*
* Note that the highest frequency might be limited for other reaasons
* than wait states, for example the STM32F405xx is limited to 168MHz
* even with 5 wait states and the highest supply voltage.
*
* STM32F401xx:
*
* LATENCY | 2.7V - 3.6V | 2.4V - 2.7V | 2.1V - 2.4V | 1.8V - 2.1V
* ------- | ----------- | ----------- | ----------- | -----------
* 0 | 30 MHz | 24 MHz | 18 MHz | 16 MHz
* 1 | 60 MHz | 48 MHz | 36 MHz | 32 MHz
* 2 | 84 MHz | 72 MHz | 54 MHz | 48 MHz
* 3 | | 84 MHz | 72 MHz | 64 MHz
* 4 | | | 84 MHz | 80 MHz
* 5 | | | | 84 MHz
*
* STM32F405xx/407xx/415xx/417xx/42xxx/43xxx:
*
* LATENCY | 2.7V - 3.6V | 2.4V - 2.7V | 2.1V - 2.4V | 1.8V - 2.1V
* ------- | ----------- | ----------- | ----------- | -----------
* 0 | 30 MHz | 24 MHz | 22 MHz | 20 MHz
* 1 | 60 MHz | 48 MHz | 44 MHz | 40 MHz
* 2 | 90 MHz | 72 MHz | 66 MHz | 60 MHz
* 3 | 120 MHz | 96 MHz | 88 MHz | 80 MHz
* 4 | 150 MHz | 120 MHz | 110 MHz | 100 MHz
* 5 | 180 MHz | 144 MHz | 132 MHz | 120 MHz
* 6 | | 168 MHz | 154 MHz | 140 MHz
* 7 | | 180 MHz | 176 MHz | 160 MHz
* 8 | | | 180 MHz | 168 MHz
*
* STM32F411x:
*
* LATENCY | 2.7V - 3.6V | 2.4V - 2.7V | 2.1V - 2.4V | 1.7V - 2.1V
* ------- | ----------- | ----------- | ----------- | -----------
* 0 | 30 MHz | 24 MHz | 18 MHz | 16 MHz
* 1 | 64 MHz | 48 MHz | 36 MHz | 32 MHz
* 2 | 90 MHz | 72 MHz | 54 MHz | 48 MHz
* 3 | 100 MHz | 96 MHz | 72 MHz | 64 MHz
* 4 | | 100 MHz | 90 MHz | 80 MHz
* 5 | | | 100 MHz | 96 MHz
* 6 | | | | 100 MHz
*/
static inline void __setup_flash(void)
{
volatile struct stm32f4x_flash *regs;
u32_t tmpreg = 0;

regs = (struct stm32f4x_flash *) FLASH_R_BASE;

if (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC <= 30000000) {
regs->acr.bit.latency = STM32F4X_FLASH_LATENCY_0;
}
#ifdef CONFIG_SOC_STM32F401XE
else if (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC <= 60000000) {
regs->acr.bit.latency = STM32F4X_FLASH_LATENCY_1;
} else if (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC <= 84000000) {
regs->acr.bit.latency = STM32F4X_FLASH_LATENCY_2;
}
#elif CONFIG_SOC_STM32F411XE
else if (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC <= 64000000) {
regs->acr.bit.latency = STM32F4X_FLASH_LATENCY_1;
} else if (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC <= 90000000) {
regs->acr.bit.latency = STM32F4X_FLASH_LATENCY_2;
} else if (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC <= 100000000) {
regs->acr.bit.latency = STM32F4X_FLASH_LATENCY_3;
}
#elif defined(CONFIG_SOC_STM32F407XX) || defined(CONFIG_SOC_STM32F429XX)
else if (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC <= 60000000) {
regs->acr.bit.latency = STM32F4X_FLASH_LATENCY_1;
} else if (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC <= 90000000) {
regs->acr.bit.latency = STM32F4X_FLASH_LATENCY_2;
} else if (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC <= 120000000) {
regs->acr.bit.latency = STM32F4X_FLASH_LATENCY_3;
} else if (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC <= 150000000) {
regs->acr.bit.latency = STM32F4X_FLASH_LATENCY_4;
} else if (CONFIG_SYS_CLOCK_HW_CYCLES_PER_SEC <= 180000000) {
regs->acr.bit.latency = STM32F4X_FLASH_LATENCY_5;
}
#else
#error Flash latency configuration for MCU model is missing
#endif

/* Make sure latency was set */
tmpreg = regs->acr.bit.latency;

}

#endif /* _STM32F4X_FLASHREGISTERS_H_ */
Loading

0 comments on commit 3d3adc8

Please sign in to comment.