Merge arm branch into master
----------------------------------------------------------------
Carles Cufi (13):
Bluetooth: controller: Use SERIES config instead of NRF52
drivers: serial: nrf5: Undefine MDK macros to avoid conflict
ext: Update Nordic MDK header files
boards: nrf52: Specify nRF52832 IC in default config
arch: arm: Refactor and cleanup nRF52 series arch code
arch: arm: Add support for the Nordic nRF52840 IC
boards: arm: Add support for the Nordic pca10056 PDK
boards: arm: Refactor the GPIO and UART dependencies
boards: nrf51_pca10028: Add button and LED definitions
boards: nrf52_pca10040: Add button and LED definitions
boards: nrf52840_pca10056: Add button and LED definitions
boards: bbc_microbit: Add button and LED definitions
gpio: nrf5x: Add support for GPIOTE and GPIO callbacks
Gil Pitney (5):
cc3200: Add a GPIO driver for the TI CC3200 LaunchXL
cc3200: Add pinmux initialization for GPIO Ports
cc3200: Add generic definitions for LEDs and switches
cc3200: Ensure UART can wake up Zephyr after wfi in idle
cc3200: Move UART peripheral clock enable into soc init
Kumar Gala (1):
sanity_chk: add nucleo_f411re to arm list of boards for sanity
Matthias Boesl (1):
board: add initial support for Nucleo-64 with Soc STM32F411RE
Maureen Helm (2):
frdm_k64f: hexiwear_k64: Fix basic blinky sample
frdm_k64f: Fix basic button sample
arch/arm/soc/nordic_nrf5/Kconfig.defconfig | 18 +
.../nordic_nrf5/nrf52/Kconfig.defconfig.nrf52832 | 4 +
.../nordic_nrf5/nrf52/Kconfig.defconfig.nrf52840 | 36 +
.../soc/nordic_nrf5/nrf52/Kconfig.defconfig.series | 4 -
arch/arm/soc/nordic_nrf5/nrf52/Kconfig.series | 1 +
arch/arm/soc/nordic_nrf5/nrf52/Kconfig.soc | 4 +-
arch/arm/soc/nordic_nrf5/nrf52/Makefile | 8 +-
arch/arm/soc/nordic_nrf5/nrf52/soc.c | 377 +-
.../st_stm32/stm32f4/Kconfig.defconfig.stm32f411xe | 34 +
arch/arm/soc/st_stm32/stm32f4/Kconfig.soc | 3 +
.../ti_simplelink/cc32xx/Kconfig.defconfig.cc3200 | 19 +
arch/arm/soc/ti_simplelink/cc32xx/soc.c | 12 +
boards/arm/96b_nitrogen/Kconfig.defconfig | 10 +-
boards/arm/bbc_microbit/Kconfig.defconfig | 10 +-
boards/arm/bbc_microbit/board.h | 56 +
boards/arm/cc3200_launchxl/board.h | 16 +
.../arm/cc3200_launchxl/cc3200_launchxl_defconfig | 3 +
boards/arm/cc3200_launchxl/pinmux.c | 38 +-
boards/arm/frdm_k64f/board.h | 12 +
boards/arm/hexiwear_k64/board.h | 6 +
boards/arm/nrf51_blenano/Kconfig.defconfig | 10 +-
boards/arm/nrf51_pca10028/Kconfig.defconfig | 10 +-
boards/arm/nrf51_pca10028/board.h | 32 +
boards/arm/nrf52840_pca10056/Kconfig | 23 +
boards/arm/nrf52840_pca10056/Kconfig.board | 19 +
boards/arm/nrf52840_pca10056/Kconfig.defconfig | 45 +
boards/arm/nrf52840_pca10056/Makefile | 2 +
boards/arm/nrf52840_pca10056/board.h | 54 +
.../nrf52840_pca10056/nrf52840_pca10056_defconfig | 20 +
boards/arm/nrf52_pca10040/Kconfig.defconfig | 10 +-
boards/arm/nrf52_pca10040/board.h | 34 +-
boards/arm/nrf52_pca10040/nrf52_pca10040_defconfig | 1 +
boards/arm/nucleo_f411re/Kconfig.board | 20 +
boards/arm/nucleo_f411re/Kconfig.defconfig | 23 +
boards/arm/nucleo_f411re/Makefile | 2 +
boards/arm/nucleo_f411re/Makefile.board | 6 +
boards/arm/nucleo_f411re/board.h | 22 +
boards/arm/nucleo_f411re/nucleo_f411re_defconfig | 36 +
boards/arm/nucleo_f411re/support/openocd.cfg | 12 +
drivers/gpio/Kconfig | 2 +
drivers/gpio/Kconfig.cc32xx | 93 +
drivers/gpio/Makefile | 1 +
drivers/gpio/gpio_cc32xx.c | 335 +
drivers/gpio/gpio_nrf5.c | 180 +-
drivers/pinmux/Makefile | 1 +
drivers/pinmux/stm32/pinmux_board_nucleo_f411re.c | 48 +
drivers/serial/Kconfig.nrf5 | 2 +-
drivers/serial/uart_nrf5.c | 16 +
ext/hal/nordic/mdk/compiler_abstraction.h | 21 +-
ext/hal/nordic/mdk/nrf.h | 36 +-
ext/hal/nordic/mdk/nrf51.h | 28 +-
ext/hal/nordic/mdk/nrf51422_peripherals.h | 144 +
ext/hal/nordic/mdk/nrf51802_peripherals.h | 144 +
ext/hal/nordic/mdk/nrf51822_peripherals.h | 144 +
ext/hal/nordic/mdk/nrf51824_peripherals.h | 144 +
ext/hal/nordic/mdk/nrf51_bitfields.h | 604 +-
ext/hal/nordic/mdk/nrf51_deprecated.h | 6 +-
ext/hal/nordic/mdk/nrf51_to_nrf52.h | 19 +-
ext/hal/nordic/mdk/nrf51_to_nrf52840.h | 567 +
ext/hal/nordic/mdk/nrf52.h | 62 +-
ext/hal/nordic/mdk/nrf52832_peripherals.h | 218 +
ext/hal/nordic/mdk/nrf52840.h | 2417 +++
ext/hal/nordic/mdk/nrf52840_bitfields.h | 14633 +++++++++++++++++++
ext/hal/nordic/mdk/nrf52840_peripherals.h | 240 +
ext/hal/nordic/mdk/nrf52_bitfields.h | 2696 +---
ext/hal/nordic/mdk/nrf52_name_change.h | 6 +-
ext/hal/nordic/mdk/nrf52_to_nrf52840.h | 88 +
ext/hal/nordic/mdk/system_nrf52.h | 4 +-
ext/hal/nordic/mdk/system_nrf52840.h | 69 +
scripts/sanity_chk/arches/arm.ini | 2 +-
subsys/bluetooth/controller/hal/radio.c | 2 +-
71 files changed, 20716 insertions(+), 3308 deletions(-)
Change-Id: I4a5c2b348e207dd5df3760b6ce1efe52f106e2fb
Signed-off-by:
Kumar Gala <kumar.gala@linaro.org>
Loading
Please sign in to comment