Skip to content
Commit 3f4f9fa6 authored by Maureen Helm's avatar Maureen Helm
Browse files

Merge arm branch into master



Main changes:

- Refactor stm32 to use Cube LL clock driver
- Convert arm scb to use direct CMSIS register access
- Add board documentation

----------------------------------------------------------------
Adam Podogrocki (1):
      gpio/stm32: fix in setting alternative function

Erwan Gouriou (19):
      clock control:stm32: provide STM32Cube LL based driver
      gpio: update stm32 gpio to support LL clock control driver
      pinmux: update stm32 pinmux to support LL clock control driver
      uart: update stm32 uart to support LL clock control driver
      i2c: stm32: change deprecated constant
      i2c: update stm32 i2c_lx to support LL clock control driver
      pwm: update stm32 pwm to support LL clock control driver
      flash: update stm32 flash_f3x to support LL clock control driver
      soc: stm32l4xx: support of Cube LL Clock driver
      soc: stm32f3xx: support of Cube LL Clock driver
      board: nucleo_f334r8: enable support of LL Cube clock control driver
      board: stm32373c_eval: enable support of LL Cube clock control driver
      boards: nucleo_l476rg: enable support of LL Cube clock control driver
      soc: stm32l4x: clean up after Cube LL clock control
      soc: stm32f3x: clean up after Cube LL clock control
      clock control: clean up after stm32cube LL driver
      drivers: stm32: clean up after stm23cube based clock control
      clock_control: stm32: code optimization
      board: add nucleo_l476rg documentation

Kumar Gala (12):
      arm: cmsis: Convert _ScbIsNestedExc to use direct CMSIS register access
      arm: cmsis: Convert FaultEnable to use direct CMSIS register access
      arm: cmsis: Convert _ScbActiveVectorGet to use direct CMSIS register access
      arm: cmsis: Convert _ScbHardFaultIsForced to use direct CMSIS register access
      arm: cmsis: Convert _ScbDivByZeroFaultEnable to use direct CMSIS register access
      arm: cmsis: Convert _Scb*FaultIs* & _ScbIs*Fault to use CMSIS register access
      arm: cmsis: Convert _Scb*FaultAddrGet to use direct CMSIS register access
      arm: cmsis: Convert printing of MMFSR, BFSR, and UFSR to CMSIS
      arm: cmsis: Convert _ClearFaults to use direct CMSIS register access
      arm: cmsis: Convert _Scb*Fault*Reset to use direct CMSIS register access
      arm: cmsis: cleanup use of _SCS_CPACR_CP1{0,1}_Pos define
      arm: cmsis: Remove last bits of scs/scb as we've converted to CMSIS

Maureen Helm (1):
      hexiwear_k64: Add RST board documentation

 arch/arm/core/cortex_m/Makefile                             |   2 +-
 arch/arm/core/cortex_m/scs.c                                |  22 --
 arch/arm/core/fault.c                                       |  88 +++---
 arch/arm/core/fault_s.S                                     |   2 +-
 arch/arm/include/cortex_m/exc.h                             |  18 +-
 arch/arm/soc/st_stm32/stm32f3/rcc_registers.h               |  89 ------
 arch/arm/soc/st_stm32/stm32f3/soc.c                         |   3 +-
 arch/arm/soc/st_stm32/stm32f3/soc.h                         |   7 +
 arch/arm/soc/st_stm32/stm32f3/soc_config.c                  |  22 --
 arch/arm/soc/st_stm32/stm32f3/soc_gpio.c                    |   9 +-
 arch/arm/soc/st_stm32/stm32f3/soc_registers.h               |   1 -
 arch/arm/soc/st_stm32/stm32l4/rcc_registers.h               | 176 -----------
 arch/arm/soc/st_stm32/stm32l4/soc.c                         |   3 +-
 arch/arm/soc/st_stm32/stm32l4/soc.h                         |   7 +
 arch/arm/soc/st_stm32/stm32l4/soc_gpio.c                    |   8 +-
 arch/arm/soc/st_stm32/stm32l4/soc_pinmux.c                  |  20 --
 arch/arm/soc/st_stm32/stm32l4/soc_registers.h               |   1 -
 boards/arm/hexiwear_k64/doc/hexiwear_k64.jpg                | Bin 0 -> 504461 bytes
 boards/arm/hexiwear_k64/doc/hexiwear_k64.rst                | 273 ++++++++++++++++
 boards/arm/nucleo_f334r8/nucleo_f334r8_defconfig            |  24 +-
 boards/arm/nucleo_l476rg/doc/img/nucleo64_ulp_logo_1024.jpg | Bin 0 -> 16731 bytes
 boards/arm/nucleo_l476rg/doc/img/nucleo_l476rg_arduino.png  | Bin 0 -> 564540 bytes
 boards/arm/nucleo_l476rg/doc/img/nucleo_l476rg_morpho.png   | Bin 0 -> 485284 bytes
 boards/arm/nucleo_l476rg/doc/nucleol476rg.rst               | 239 ++++++++++++++
 boards/arm/nucleo_l476rg/nucleo_l476rg_defconfig            |  25 +-
 boards/arm/stm32373c_eval/stm32373c_eval_defconfig          |  24 +-
 drivers/clock_control/Kconfig                               |   6 +-
 drivers/clock_control/Kconfig.stm32                         | 186 +++++++++++
 drivers/clock_control/Kconfig.stm32f3x                      | 115 -------
 drivers/clock_control/Kconfig.stm32l4x                      | 140 --------
 drivers/clock_control/Makefile                              |   8 +-
 drivers/clock_control/stm32_ll_clock.c                      | 295 +++++++++++++++++
 drivers/clock_control/stm32_ll_clock.h                      |  16 +
 drivers/clock_control/stm32f3x_clock.c                      | 398 -----------------------
 drivers/clock_control/stm32f3x_ll_clock.c                   |  73 +++++
 drivers/clock_control/stm32l4x_clock.c                      | 383 ----------------------
 drivers/clock_control/stm32l4x_ll_clock.c                   |  35 ++
 drivers/flash/flash_stm32f3x.c                              |   9 +-
 drivers/flash/flash_stm32f3x.h                              |   2 +-
 drivers/flash/flash_stm32f3x_priv.c                         |   4 +-
 drivers/gpio/gpio_stm32.c                                   |  95 +++---
 drivers/gpio/gpio_stm32.h                                   |  32 +-
 drivers/i2c/i2c_stm32lx.c                                   |  13 +-
 drivers/i2c/i2c_stm32lx.h                                   |   2 +-
 drivers/pinmux/stm32/pinmux_stm32.c                         |  43 ++-
 drivers/pwm/pwm_stm32.c                                     |  50 ++-
 drivers/pwm/pwm_stm32.h                                     |   6 +-
 drivers/serial/uart_stm32.c                                 |  34 +-
 drivers/serial/uart_stm32.h                                 |   8 +-
 ext/hal/st/stm32cube/Kbuild                                 |   2 +
 include/arch/arm/arch.h                                     |   2 -
 include/arch/arm/cortex_m/cmsis.h                           |  69 +++-
 include/arch/arm/cortex_m/scb.h                             | 583 ----------------------------------
 include/arch/arm/cortex_m/scs.h                             | 598 -----------------------------------
 include/drivers/clock_control/stm32_clock_control.h         |  21 +-
 include/drivers/clock_control/stm32f3_clock_control.h       | 114 -------
 include/drivers/clock_control/stm32l4x_clock_control.h      | 101 ------
 include/section_tags.h                                      |   1 -
 58 files changed, 1531 insertions(+), 2976 deletions(-)
 delete mode 100644 arch/arm/core/cortex_m/scs.c
 delete mode 100644 arch/arm/soc/st_stm32/stm32f3/rcc_registers.h
 delete mode 100644 arch/arm/soc/st_stm32/stm32l4/rcc_registers.h
 create mode 100644 boards/arm/hexiwear_k64/doc/hexiwear_k64.jpg
 create mode 100644 boards/arm/hexiwear_k64/doc/hexiwear_k64.rst
 create mode 100644 boards/arm/nucleo_l476rg/doc/img/nucleo64_ulp_logo_1024.jpg
 create mode 100644 boards/arm/nucleo_l476rg/doc/img/nucleo_l476rg_arduino.png
 create mode 100644 boards/arm/nucleo_l476rg/doc/img/nucleo_l476rg_morpho.png
 create mode 100644 boards/arm/nucleo_l476rg/doc/nucleol476rg.rst
 create mode 100644 drivers/clock_control/Kconfig.stm32
 delete mode 100644 drivers/clock_control/Kconfig.stm32f3x
 delete mode 100644 drivers/clock_control/Kconfig.stm32l4x
 create mode 100644 drivers/clock_control/stm32_ll_clock.c
 create mode 100644 drivers/clock_control/stm32_ll_clock.h
 delete mode 100644 drivers/clock_control/stm32f3x_clock.c
 create mode 100644 drivers/clock_control/stm32f3x_ll_clock.c
 delete mode 100644 drivers/clock_control/stm32l4x_clock.c
 create mode 100644 drivers/clock_control/stm32l4x_ll_clock.c
 delete mode 100644 include/arch/arm/cortex_m/scb.h
 delete mode 100644 include/arch/arm/cortex_m/scs.h
 delete mode 100644 include/drivers/clock_control/stm32f3_clock_control.h
 delete mode 100644 include/drivers/clock_control/stm32l4x_clock_control.h

Change-Id: I0b64f0b663153088e4e16babbf60a546f7b5fbb5
Signed-off-by: default avatarMaureen Helm <maureen.helm@nxp.com>
parents b4b39584 6ca87b57
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment