diff options
author | Ovidiu Panait <ovidiu.panait@windriver.com> | 2022-01-01 19:13:27 +0200 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2022-01-18 08:31:02 -0500 |
commit | 78fc0395c01640df0fa9b8be736bf855a0416b56 (patch) | |
tree | d9d621f78628d6dff4d16f7a2e4ca736378cf1ed | |
parent | 485c90c06bbb01f9ae3e5746836152ce5ea36c0f (diff) | |
download | u-boot-78fc0395c01640df0fa9b8be736bf855a0416b56.zip u-boot-78fc0395c01640df0fa9b8be736bf855a0416b56.tar.gz u-boot-78fc0395c01640df0fa9b8be736bf855a0416b56.tar.bz2 |
common: board_r: drop initr_kgdb wrapper
Add a return value to kgdb_init and use it directly in the post-relocation
init sequence, rather than using a wrapper stub. Also, move the "KGDB"
print message inside kgdb_init().
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
-rw-r--r-- | common/board_r.c | 11 | ||||
-rw-r--r-- | common/kgdb.c | 7 | ||||
-rw-r--r-- | include/kgdb.h | 11 |
3 files changed, 16 insertions, 13 deletions
diff --git a/common/board_r.c b/common/board_r.c index f81d21a..f12e245 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -498,15 +498,6 @@ static int initr_ethaddr(void) } #endif /* CONFIG_CMD_NET */ -#ifdef CONFIG_CMD_KGDB -static int initr_kgdb(void) -{ - puts("KGDB: "); - kgdb_init(); - return 0; -} -#endif - #if defined(CONFIG_LED_STATUS) static int initr_status_led(void) { @@ -769,7 +760,7 @@ static init_fnc_t init_sequence_r[] = { #endif INIT_FUNC_WATCHDOG_RESET #ifdef CONFIG_CMD_KGDB - initr_kgdb, + kgdb_init, #endif interrupt_init, #if defined(CONFIG_MICROBLAZE) || defined(CONFIG_M68K) diff --git a/common/kgdb.c b/common/kgdb.c index 4493a15..29b09fc 100644 --- a/common/kgdb.c +++ b/common/kgdb.c @@ -527,15 +527,18 @@ handle_exception (struct pt_regs *regs) * kgdb_init must be called *after* the * monitor is relocated into ram */ -void -kgdb_init(void) +int kgdb_init(void) { + puts("KGDB: "); + kgdb_serial_init(); debugger_exception_handler = handle_exception; initialized = 1; putDebugStr("kgdb ready\n"); puts("ready\n"); + + return 0; } void diff --git a/include/kgdb.h b/include/kgdb.h index 616ce44..bdba347 100644 --- a/include/kgdb.h +++ b/include/kgdb.h @@ -39,7 +39,16 @@ typedef kgdb_data; /* these functions are provided by the generic kgdb support */ -extern void kgdb_init(void); +/** + * kgdb_init() + * + * Perform initializations to allow debugging U-Boot with gdb over a serial + * link. It is called during the generic board init sequence. + * + * Return: 0 if OK + */ +int kgdb_init(void); + extern void kgdb_error(int); extern int kgdb_output_string(const char *, unsigned int); extern void breakpoint(void); |