diff options
| author | Kumar Gala <kumar.gala@linaro.org> | 2017-01-25 09:42:32 -0600 |
|---|---|---|
| committer | Kumar Gala <kumar.gala@linaro.org> | 2017-01-30 11:02:39 -0600 |
| commit | 843e3568deac7f5eda46c296669b1687f7dad448 (patch) | |
| tree | 680d7bb7a3bd00e9f70b955acb17b9cda8744353 | |
| parent | 772cbd195590af09659048a3878318e9bbb7d6e3 (diff) | |
arm: scb: Move SCB asm defines into cpu_idle.S
As cpu_idle.S is the only bit of code that is using the SCB asm defines,
so to allow us to remove scb.h in the future lets move the defines that
are used just into cpu_idle.S
Jira: ZEP-1568
Change-Id: I3c3a6f145ec4c1a43f076d079d5fe1694c255b78
Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
| -rw-r--r-- | arch/arm/core/cpu_idle.S | 5 | ||||
| -rw-r--r-- | include/arch/arm/cortex_m/scb.h | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/core/cpu_idle.S b/arch/arm/core/cpu_idle.S index 43a963834..b139539a6 100644 --- a/arch/arm/core/cpu_idle.S +++ b/arch/arm/core/cpu_idle.S @@ -28,6 +28,11 @@ GTEXT(_NanoIdleValClear) GTEXT(k_cpu_idle) GTEXT(k_cpu_atomic_idle) +#define _SCB_SCR 0xE000ED10 + +#define _SCB_SCR_SEVONPEND (1 << 4) +#define _SCB_SCR_SLEEPDEEP (1 << 2) +#define _SCB_SCR_SLEEPONEXIT (1 << 1) #define _SCR_INIT_BITS _SCB_SCR_SEVONPEND /** diff --git a/include/arch/arm/cortex_m/scb.h b/include/arch/arm/cortex_m/scb.h index d5358aa3c..d2bbdf224 100644 --- a/include/arch/arm/cortex_m/scb.h +++ b/include/arch/arm/cortex_m/scb.h @@ -35,13 +35,6 @@ extern "C" { #ifdef _ASMLANGUAGE -/* needed by k_cpu_atomic_idle() written in asm */ -#define _SCB_SCR 0xE000ED10 - -#define _SCB_SCR_SEVONPEND (1 << 4) -#define _SCB_SCR_SLEEPDEEP (1 << 2) -#define _SCB_SCR_SLEEPONEXIT (1 << 1) - #else #include <kernel.h> |