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>

diff --git a/common/board_r.c b/common/board_r.c
index f81d21a282b5e35b952ba2e36107f6de1cb84516..f12e2458ecb43b3440a49880ce9fc01a7a3b62fb 100644 (file)
--- 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 4493a1591986c3380df2c86d40a8996b1688b96a..29b09fcfe56b3cf4d6a69b54dbdc9dd0af648be2 100644 (file)
--- 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 616ce4451f15ad92c70466d7d9f3f43ab9bb1f4f..bdba347a7f3e1d0d906c5224615e915019b03b2c 100644 (file)
--- 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);