diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-07-12 07:10:18 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-07-12 07:10:18 +0200 |
| commit | 5ed435f33dc6a31cd93b6f38a14dd775977cf1cc (patch) | |
| tree | a5679efee0260214cece15ba83938e4c6f007f11 /arch/arm/include/asm/barebox-arm-head.h | |
| parent | 05f49fa0edb6166f80b8a37a172d6b83db2d92d1 (diff) | |
| parent | ba927c778091295310fdb105e10c257a0cfc61a3 (diff) | |
| download | barebox-5ed435f33dc6a31cd93b6f38a14dd775977cf1cc.tar.gz barebox-5ed435f33dc6a31cd93b6f38a14dd775977cf1cc.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch/arm/include/asm/barebox-arm-head.h')
| -rw-r--r-- | arch/arm/include/asm/barebox-arm-head.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/include/asm/barebox-arm-head.h b/arch/arm/include/asm/barebox-arm-head.h index 5c6205c815..83a22c4d94 100644 --- a/arch/arm/include/asm/barebox-arm-head.h +++ b/arch/arm/include/asm/barebox-arm-head.h @@ -64,6 +64,13 @@ static inline void __barebox_arm_head(void) ".word 0x55555555\n" ".endr\n" "2:\n" +#ifdef CONFIG_PBL_BREAK + "bkpt #17\n" + "nop\n" +#else + "nop\n" + "nop\n" +#endif ); } static inline void barebox_arm_head(void) |