From 78fc0395c01640df0fa9b8be736bf855a0416b56 Mon Sep 17 00:00:00 2001 From: Ovidiu Panait Date: Sat, 1 Jan 2022 19:13:27 +0200 Subject: 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 Signed-off-by: Ovidiu Panait --- common/board_r.c | 11 +---------- common/kgdb.c | 7 +++++-- 2 files changed, 6 insertions(+), 12 deletions(-) (limited to 'common') diff --git a/common/board_r.c b/common/board_r.c index f81d21a282b..f12e2458ecb 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 4493a159198..29b09fcfe56 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 -- cgit v1.3.1