diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-12-10 05:41:34 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-12-10 05:41:34 +0100 |
| commit | 77d783a5170896aea021ec180e16751a0a249627 (patch) | |
| tree | f61e969576c736cdd4d06f89bf8b8dae22093298 /arch/arm/include | |
| parent | 293e981e7452511a876431aa076c0eb256623124 (diff) | |
| parent | af86e3a0548e16dc9cef13debd3d64d9091ba473 (diff) | |
| download | barebox-77d783a5170896aea021ec180e16751a0a249627.tar.gz barebox-77d783a5170896aea021ec180e16751a0a249627.tar.xz | |
Merge branch 'for-next/randfixes'
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/barebox-arm-head.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/include/asm/barebox-arm-head.h b/arch/arm/include/asm/barebox-arm-head.h index 83a22c4d94..8409a77d2e 100644 --- a/arch/arm/include/asm/barebox-arm-head.h +++ b/arch/arm/include/asm/barebox-arm-head.h @@ -65,7 +65,11 @@ static inline void __barebox_arm_head(void) ".endr\n" "2:\n" #ifdef CONFIG_PBL_BREAK +#ifdef CONFIG_CPU_V8 + "brk #17\n" +#else "bkpt #17\n" +#endif "nop\n" #else "nop\n" |