michaelh/zephyr
1
0
Fork 0
Code Releases Activity

arm: cortex_m: Use new ARMV6_M_ARMV8_M_BASELINE in vector relay

Browse source 
The old ARMV6_M Kconfig option has been removed, and so to correctly set
the dependencies for SW_VECTOR_RELAY we need to use the new
ARMV6_M_ARMV8_M_BASELINE.

Signed-off-by: Carles Cufi <carles.cufi@nordicsemi.no>
This commit is contained in:
Carles Cufi 2018-02-14 12:02:59 +01:00 • committed by Carles Cufí
commit f24f50b12e
3 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

11
arch/arm/core/cortex_m/Kconfig
View file

@ -235,14 +235,15 @@ config ZERO_LATENCY_IRQS
config SW_VECTOR_RELAY config SW_VECTOR_RELAY
bool bool
prompt "Enable ARMv6-M Vector Table soft relay" prompt "Enable Software Vector Relay"
default n default n
default y if BOOTLOADER_MCUBOOT default y if BOOTLOADER_MCUBOOT
depends on ARMV6_M && !(CPU_CORTEX_M0_HAS_VECTOR_TABLE_REMAP || CPU_CORTEX_M_HAS_VTOR) depends on ARMV6_M_ARMV8_M_BASELINE && !(CPU_CORTEX_M0_HAS_VECTOR_TABLE_REMAP || CPU_CORTEX_M_HAS_VTOR)
help help
Add ARMv6-M Vector Table relay handler and relay vector table, to Add Vector Table relay handler and relay vector table, to
relay interrupts based on a vector table pointer. This is only relay interrupts based on a vector table pointer. This is only
required for Cortex-M0 with no hardware vector table relocation required for Cortex-M0 (or an Armv8-M baseline core) with no hardware
mechanisms or for Cortex-M0+ with no VTOR and no other hardware vector table relocation mechanisms or for Cortex-M0+
(or an Armv8-M baseline core) with no VTOR and no other hardware
relocation table mechanisms. relocation table mechanisms.
endmenu endmenu

13
arch/arm/core/irq_relay.S
View file

@ -7,15 +7,16 @@
/** /**
* @file irq_relay.S * @file irq_relay.S
* *
* @brief IRQ relay vector table and relay handler for Cortex-M0 SoC * @brief IRQ relay vector table and relay handler for Cortex-M0 or
* Armv8-M baseline SoCs
* *
* In Cortex-M0, the vector table address can not be changed. Once the * In certain ARMv6-M and Armv8-M baseline cores the vector table address can
* vector table is occupied by bootloader, there will be no IRQ support * not be changed. Once the * vector table is occupied by bootloader, there
* in chainloaded image. * will be no IRQ support in the chainloaded image.
* *
* This program will link into bootloader, once an interrupt is coming, * This program will link into bootloader, once an interrupt is coming,
* bootloader can forward the interrupt to the chainloaded image. This * the bootloader can forward the interrupt to the chainloaded image. This
* will support DFU on Cortex-M0 plantform. * will support DFU on those cores.
* *
* Note: Currently support mcuboot only. * Note: Currently support mcuboot only.
* */ * */

4
misc/Kconfig
View file

@ -323,8 +323,8 @@ config BOOTLOADER_MCUBOOT
* Setting TEXT_LOAD_OFFSET to a default value that allows space for * Setting TEXT_LOAD_OFFSET to a default value that allows space for
the MCUboot image header the MCUboot image header
* Activating SW_VECTOR_RELAY on Cortex-M0 targets with no built-in * Activating SW_VECTOR_RELAY on Cortex-M0 (or Armv8-M baseline)
vector relocation mechanisms targets with no built-in vector relocation mechanisms
* Including dts/common/mcuboot.overlay when building the Device * Including dts/common/mcuboot.overlay when building the Device
Tree in order to place and link the image at the slot0 offset Tree in order to place and link the image at the slot0 offset