From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Rouven Czerwinski <r.czerwinski@pengutronix.de>,
Oleksij Rempel <linux@rempel-privat.de>
Subject: [PATCH v2 2/3] add CONFIG_PBL_BREAK option
Date: Fri, 7 Jun 2019 08:36:53 +0200 [thread overview]
Message-ID: <20190607063652.8961-2-r.czerwinski@pengutronix.de> (raw)
In-Reply-To: <20190607063652.8961-1-r.czerwinski@pengutronix.de>
From: Oleksij Rempel <linux@rempel-privat.de>
With this option barebox will be build with breakpoint instruction
in early pbl stage.
Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
arch/arm/cpu/common.c | 13 +++++++++++++
arch/arm/cpu/start.c | 2 ++
arch/arm/include/asm/barebox-arm.h | 2 ++
common/Kconfig | 7 +++++++
4 files changed, 24 insertions(+)
diff --git a/arch/arm/cpu/common.c b/arch/arm/cpu/common.c
index 51fe7ed988..6fe3476aa2 100644
--- a/arch/arm/cpu/common.c
+++ b/arch/arm/cpu/common.c
@@ -30,6 +30,19 @@
#define R_ARM_RELATIVE 23
#define R_AARCH64_RELATIVE 1027
+void pbl_barebox_break(void)
+{
+ __asm__ __volatile__ (
+#ifdef CONFIG_PBL_BREAK
+ "bkpt #17\n"
+ "nop\n"
+#else
+ "nop\n"
+ "nop\n"
+#endif
+ );
+}
+
/*
* relocate binary to the currently running address
*/
diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
index 6573c2ef74..6bfc4da34c 100644
--- a/arch/arm/cpu/start.c
+++ b/arch/arm/cpu/start.c
@@ -168,6 +168,8 @@ __noreturn void barebox_non_pbl_start(unsigned long membase,
barrier();
+ pbl_barebox_break();
+
pr_debug("memory at 0x%08lx, size 0x%08lx\n", membase, memsize);
arm_endmem = endmem;
diff --git a/arch/arm/include/asm/barebox-arm.h b/arch/arm/include/asm/barebox-arm.h
index a11d34923d..12765b7277 100644
--- a/arch/arm/include/asm/barebox-arm.h
+++ b/arch/arm/include/asm/barebox-arm.h
@@ -55,6 +55,7 @@ static inline unsigned long global_variable_offset(void)
}
void setup_c(void);
+void pbl_barebox_break(void);
void relocate_to_current_adr(void);
void relocate_to_adr(unsigned long target);
void __noreturn barebox_arm_entry(unsigned long membase, unsigned long memsize, void *boarddata);
@@ -177,6 +178,7 @@ static inline unsigned long arm_mem_barebox_image(unsigned long membase,
(uint32_t r0, uint32_t r1, uint32_t r2) \
{ \
__barebox_arm_head(); \
+ pbl_barebox_break(); \
__##name(r0, r1, r2); \
} \
static void NAKED noinline __##name \
diff --git a/common/Kconfig b/common/Kconfig
index ffb7537592..4124857a0a 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -1245,6 +1245,13 @@ config DEBUG_INITCALLS
help
If enabled this will print initcall traces.
+
+config PBL_BREAK
+ bool "Execute software break on pbl start"
+ help
+ If this enabled, barebox will be compiled with BKPT instruction
+ on early pbl init. This option be used only with JTAG debugger!
+
endmenu
config HAS_DEBUG_LL
--
2.21.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2019-06-07 6:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-07 6:36 [PATCH v2 1/3] remove CONFIG_DEBUG_INFO Rouven Czerwinski
2019-06-07 6:36 ` Rouven Czerwinski [this message]
2019-06-07 6:36 ` [PATCH v2 3/3] add gdb helper scripts to load barebox symbols Rouven Czerwinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190607063652.8961-2-r.czerwinski@pengutronix.de \
--to=r.czerwinski@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=linux@rempel-privat.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox