[U-Boot] [RFC][PATCH 02/19] relocation: fixup cmdtable

[U-Boot] [RFC][PATCH 02/19] relocation: fixup cmdtable

[Heiko Schocher]

fixup_cmdtable() did all work for fixing up the cmdtable,
if CONFIG_RELOC_FIXUP_WORKS is not defined.

Signed-off-by: Heiko Schocher <hs@denx.de>
---
 common/command.c  |   33 +++++++++++++++++++++++++++++++++
 include/command.h |    3 +++
 2 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/common/command.c b/common/command.c
index 30a9801..7d0ac98 100644
--- a/common/command.c
+++ b/common/command.c
@@ -464,3 +464,36 @@ int cmd_get_data_size(char* arg, int default_size)
 	return default_size;
 }
 #endif
+
+#if !defined(CONFIG_RELOC_FIXUP_WORKS)
+DECLARE_GLOBAL_DATA_PTR;
+
+void fixup_cmdtable(cmd_tbl_t *cmdtp, int size)
+{
+	int	i;
+
+	if (gd->reloc_off == 0)
+		return;
+
+	for (i = 0; i < size; i++) {
+		ulong addr;
+
+		addr = (ulong) (cmdtp->cmd) + gd->reloc_off;
+		cmdtp->cmd =
+			(int (*)(struct cmd_tbl_s *, int, int, char * const []))addr;
+		addr = (ulong)(cmdtp->name) + gd->reloc_off;
+		cmdtp->name = (char *)addr;
+		if (cmdtp->usage) {
+			addr = (ulong)(cmdtp->usage) + gd->reloc_off;
+			cmdtp->usage = (char *)addr;
+		}
+#ifdef	CONFIG_SYS_LONGHELP
+		if (cmdtp->help) {
+			addr = (ulong)(cmdtp->help) + gd->reloc_off;
+			cmdtp->help = (char *)addr;
+		}
+#endif
+		cmdtp++;
+	}
+}
+#endif
diff --git a/include/command.h b/include/command.h
index 9144d69..5c14616 100644
--- a/include/command.h
+++ b/include/command.h
@@ -125,4 +125,7 @@ cmd_tbl_t __u_boot_cmd_##name Struct_Section = {#name, maxargs, rep, cmd, usage}

 #endif	/* CONFIG_SYS_LONGHELP */

+#if !defined(CONFIG_RELOC_FIXUP_WORKS)
+void fixup_cmdtable(cmd_tbl_t *cmdtp, int size);
+#endif
 #endif	/* __COMMAND_H */
-- 
1.6.2.5

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

[U-Boot] [RFC][PATCH 02/19] relocation: fixup cmdtable

[Peter Tyser]

> +#if !defined(CONFIG_RELOC_FIXUP_WORKS)
> +DECLARE_GLOBAL_DATA_PTR;
> +
> +void fixup_cmdtable(cmd_tbl_t *cmdtp, int size)
> +{
> +	int	i;
> +
> +	if (gd->reloc_off == 0)
> +		return;
> +
> +	for (i = 0; i < size; i++) {
> +		ulong addr;
> +
> +		addr = (ulong) (cmdtp->cmd) + gd->reloc_off;
> +		cmdtp->cmd =
> +			(int (*)(struct cmd_tbl_s *, int, int, char * const []))addr;
> +		addr = (ulong)(cmdtp->name) + gd->reloc_off;
> +		cmdtp->name = (char *)addr;
> +		if (cmdtp->usage) {
> +			addr = (ulong)(cmdtp->usage) + gd->reloc_off;
> +			cmdtp->usage = (char *)addr;
> +		}
> +#ifdef	CONFIG_SYS_LONGHELP
> +		if (cmdtp->help) {
> +			addr = (ulong)(cmdtp->help) + gd->reloc_off;
> +			cmdtp->help = (char *)addr;
> +		}
> +#endif
> +		cmdtp++;
> +	}
> +}

A number of other arches have this same logic in arch-specific code, eg
arch/mips/lib/board.c.  Could you also convert them to use the new
fixup_cmdtable() in this patch?

Best,
Peter

[U-Boot] [RFC][PATCH 02/19] relocation: fixup cmdtable

[Heiko Schocher]

Hello Peter,

Peter Tyser wrote:
>> +#if !defined(CONFIG_RELOC_FIXUP_WORKS)
>> +DECLARE_GLOBAL_DATA_PTR;
>> +
>> +void fixup_cmdtable(cmd_tbl_t *cmdtp, int size)
>> +{
>> +	int	i;
>> +
>> +	if (gd->reloc_off == 0)
>> +		return;
>> +
>> +	for (i = 0; i < size; i++) {
>> +		ulong addr;
>> +
>> +		addr = (ulong) (cmdtp->cmd) + gd->reloc_off;
>> +		cmdtp->cmd =
>> +			(int (*)(struct cmd_tbl_s *, int, int, char * const []))addr;
>> +		addr = (ulong)(cmdtp->name) + gd->reloc_off;
>> +		cmdtp->name = (char *)addr;
>> +		if (cmdtp->usage) {
>> +			addr = (ulong)(cmdtp->usage) + gd->reloc_off;
>> +			cmdtp->usage = (char *)addr;
>> +		}
>> +#ifdef	CONFIG_SYS_LONGHELP
>> +		if (cmdtp->help) {
>> +			addr = (ulong)(cmdtp->help) + gd->reloc_off;
>> +			cmdtp->help = (char *)addr;
>> +		}
>> +#endif
>> +		cmdtp++;
>> +	}
>> +}
> 
> A number of other arches have this same logic in arch-specific code, eg
> arch/mips/lib/board.c.  Could you also convert them to use the new
> fixup_cmdtable() in this patch?

Ah, Ok, I can try it. This will then result, that this patch can go
direct to mainline, right?

As I see in the code, this should be possible for the following
architectures:

avr32
m68k
mips

I make a patch for this, but couldn;t test it ...

bye
Heiko
-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

[U-Boot] [RFC][PATCH 02/19] relocation: fixup cmdtable

[Peter Tyser]

On Fri, 2010-07-30 at 08:00 +0200, Heiko Schocher wrote:
> Hello Peter,
> 
> Peter Tyser wrote:
> >> +#if !defined(CONFIG_RELOC_FIXUP_WORKS)
> >> +DECLARE_GLOBAL_DATA_PTR;
> >> +
> >> +void fixup_cmdtable(cmd_tbl_t *cmdtp, int size)
> >> +{
> >> +	int	i;
> >> +
> >> +	if (gd->reloc_off == 0)
> >> +		return;
> >> +
> >> +	for (i = 0; i < size; i++) {
> >> +		ulong addr;
> >> +
> >> +		addr = (ulong) (cmdtp->cmd) + gd->reloc_off;
> >> +		cmdtp->cmd =
> >> +			(int (*)(struct cmd_tbl_s *, int, int, char * const []))addr;
> >> +		addr = (ulong)(cmdtp->name) + gd->reloc_off;
> >> +		cmdtp->name = (char *)addr;
> >> +		if (cmdtp->usage) {
> >> +			addr = (ulong)(cmdtp->usage) + gd->reloc_off;
> >> +			cmdtp->usage = (char *)addr;
> >> +		}
> >> +#ifdef	CONFIG_SYS_LONGHELP
> >> +		if (cmdtp->help) {
> >> +			addr = (ulong)(cmdtp->help) + gd->reloc_off;
> >> +			cmdtp->help = (char *)addr;
> >> +		}
> >> +#endif
> >> +		cmdtp++;
> >> +	}
> >> +}
> > 
> > A number of other arches have this same logic in arch-specific code, eg
> > arch/mips/lib/board.c.  Could you also convert them to use the new
> > fixup_cmdtable() in this patch?
> 
> Ah, Ok, I can try it. This will then result, that this patch can go
> direct to mainline, right?

Yes, I'd think this patch would be accepted regardless of the other ARM
relocation changes as its a general improvement.

> As I see in the code, this should be possible for the following
> architectures:
> 
> avr32
> m68k
> mips

I believe sparc should also be included.

Best,
Peter

[U-Boot] [RFC][PATCH v2 02/19] relocation: fixup cmdtable

[Heiko Schocher]

fixup_cmdtable() did all work for fixing up the cmdtable,
if CONFIG_RELOC_FIXUP_WORKS is not defined.

Signed-off-by: Heiko Schocher <hs@denx.de>
---

- changes since v1
  add comment from Peter Tyser
  - as this code is also "copied" in avr32, m68k and mips
    plattforms, use this common function fixup_cmdtable()
    on this architectures too.
    I couldn;t test this, so please test and report

 arch/avr32/lib/board.c |   25 ++++---------------------
 arch/m68k/lib/board.c  |   27 ++++-----------------------
 arch/mips/lib/board.c  |   28 ++++------------------------
 arch/sparc/lib/board.c |   28 ++++------------------------
 common/command.c       |   37 +++++++++++++++++++++++++++++++++++++
 include/command.h      |    3 +++
 6 files changed, 56 insertions(+), 92 deletions(-)

diff --git a/arch/avr32/lib/board.c b/arch/avr32/lib/board.c
index 254aecf..48829cf 100644
--- a/arch/avr32/lib/board.c
+++ b/arch/avr32/lib/board.c
@@ -269,30 +269,13 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)

 	monitor_flash_len = _edata - _text;

+#if !defined(CONFIG_RELOC_FIXUP_WORKS)
 	/*
 	 * We have to relocate the command table manually
 	 */
-	for (cmdtp = &__u_boot_cmd_start;
-	     cmdtp !=  &__u_boot_cmd_end; cmdtp++) {
-		unsigned long addr;
-
-		addr = (unsigned long)cmdtp->cmd + gd->reloc_off;
-		cmdtp->cmd = (typeof(cmdtp->cmd))addr;
-
-		addr = (unsigned long)cmdtp->name + gd->reloc_off;
-		cmdtp->name = (typeof(cmdtp->name))addr;
-
-		if (cmdtp->usage) {
-			addr = (unsigned long)cmdtp->usage + gd->reloc_off;
-			cmdtp->usage = (typeof(cmdtp->usage))addr;
-		}
-#ifdef CONFIG_SYS_LONGHELP
-		if (cmdtp->help) {
-			addr = (unsigned long)cmdtp->help + gd->reloc_off;
-			cmdtp->help = (typeof(cmdtp->help))addr;
-		}
-#endif
-	}
+	fixup_cmdtable(&__u_boot_cmd_start,
+		(ulong)(&__u_boot_cmd_end - &__u_boot_cmd_start));
+#endif /* !defined(CONFIG_RELOC_FIXUP_WORKS) */

 	/* there are some other pointer constants we must deal with */
 #ifndef CONFIG_ENV_IS_NOWHERE
diff --git a/arch/m68k/lib/board.c b/arch/m68k/lib/board.c
index 732023d..9909f4c 100644
--- a/arch/m68k/lib/board.c
+++ b/arch/m68k/lib/board.c
@@ -433,33 +433,14 @@ void board_init_r (gd_t *id, ulong dest_addr)

 	monitor_flash_len = (ulong)&__init_end - dest_addr;

+#if !defined(CONFIG_RELOC_FIXUP_WORKS)
 	/*
 	 * We have to relocate the command table manually
 	 */
-	for (cmdtp = &__u_boot_cmd_start; cmdtp !=  &__u_boot_cmd_end; cmdtp++) {
-		ulong addr;
-		addr = (ulong) (cmdtp->cmd) + gd->reloc_off;
-#if 0
-		printf ("Command \"%s\": 0x%08lx => 0x%08lx\n",
-				cmdtp->name, (ulong) (cmdtp->cmd), addr);
-#endif
-		cmdtp->cmd =
-			(int (*)(struct cmd_tbl_s *, int, int, char *[]))addr;
+	fixup_cmdtable(&__u_boot_cmd_start,
+		(ulong)(&__u_boot_cmd_end - &__u_boot_cmd_start));
+#endif /* !defined(CONFIG_RELOC_FIXUP_WORKS) */

-		addr = (ulong)(cmdtp->name) + gd->reloc_off;
-		cmdtp->name = (char *)addr;
-
-		if (cmdtp->usage) {
-			addr = (ulong)(cmdtp->usage) + gd->reloc_off;
-			cmdtp->usage = (char *)addr;
-		}
-#ifdef	CONFIG_SYS_LONGHELP
-		if (cmdtp->help) {
-			addr = (ulong)(cmdtp->help) + gd->reloc_off;
-			cmdtp->help = (char *)addr;
-		}
-#endif
-	}
 	/* there are some other pointer constants we must deal with */
 #ifndef CONFIG_ENV_IS_NOWHERE
 	env_name_spec += gd->reloc_off;
diff --git a/arch/mips/lib/board.c b/arch/mips/lib/board.c
index b2d113e..5cb1a49 100644
--- a/arch/mips/lib/board.c
+++ b/arch/mips/lib/board.c
@@ -304,34 +304,14 @@ void board_init_r (gd_t *id, ulong dest_addr)

 	monitor_flash_len = (ulong)&uboot_end_data - dest_addr;

+#if !defined(CONFIG_RELOC_FIXUP_WORKS)
 	/*
 	 * We have to relocate the command table manually
 	 */
-	for (cmdtp = &__u_boot_cmd_start; cmdtp !=  &__u_boot_cmd_end; cmdtp++) {
-		ulong addr;
+	fixup_cmdtable(&__u_boot_cmd_start,
+		(ulong)(&__u_boot_cmd_end - &__u_boot_cmd_start));
+#endif /* !defined(CONFIG_RELOC_FIXUP_WORKS) */

-		addr = (ulong) (cmdtp->cmd) + gd->reloc_off;
-#if 0
-		printf ("Command \"%s\": 0x%08lx => 0x%08lx\n",
-				cmdtp->name, (ulong) (cmdtp->cmd), addr);
-#endif
-		cmdtp->cmd =
-			(int (*)(struct cmd_tbl_s *, int, int, char *[]))addr;
-
-		addr = (ulong)(cmdtp->name) + gd->reloc_off;
-		cmdtp->name = (char *)addr;
-
-		if (cmdtp->usage) {
-			addr = (ulong)(cmdtp->usage) + gd->reloc_off;
-			cmdtp->usage = (char *)addr;
-		}
-#ifdef	CONFIG_SYS_LONGHELP
-		if (cmdtp->help) {
-			addr = (ulong)(cmdtp->help) + gd->reloc_off;
-			cmdtp->help = (char *)addr;
-		}
-#endif
-	}
 	/* there are some other pointer constants we must deal with */
 #ifndef CONFIG_ENV_IS_NOWHERE
 	env_name_spec += gd->reloc_off;
diff --git a/arch/sparc/lib/board.c b/arch/sparc/lib/board.c
index b776c21..d8bacfb 100644
--- a/arch/sparc/lib/board.c
+++ b/arch/sparc/lib/board.c
@@ -252,33 +252,13 @@ void board_init_f(ulong bootflag)
 	post_run(NULL, POST_ROM | post_bootmode_get(0));
 #endif

+#if !defined(CONFIG_RELOC_FIXUP_WORKS)
 	/*
 	 * We have to relocate the command table manually
 	 */
-	for (cmdtp = &__u_boot_cmd_start; cmdtp != &__u_boot_cmd_end; cmdtp++) {
-		ulong addr;
-		addr = (ulong) (cmdtp->cmd) + gd->reloc_off;
-#if DEBUG_COMMANDS
-		printf("Command \"%s\": 0x%08lx => 0x%08lx\n",
-		       cmdtp->name, (ulong) (cmdtp->cmd), addr);
-#endif
-		cmdtp->cmd =
-		    (int (*)(struct cmd_tbl_s *, int, int, char *[]))addr;
-
-		addr = (ulong) (cmdtp->name) + gd->reloc_off;
-		cmdtp->name = (char *)addr;
-
-		if (cmdtp->usage) {
-			addr = (ulong) (cmdtp->usage) + gd->reloc_off;
-			cmdtp->usage = (char *)addr;
-		}
-#ifdef	CONFIG_SYS_LONGHELP
-		if (cmdtp->help) {
-			addr = (ulong) (cmdtp->help) + gd->reloc_off;
-			cmdtp->help = (char *)addr;
-		}
-#endif
-	}
+	fixup_cmdtable(&__u_boot_cmd_start,
+		(ulong)(&__u_boot_cmd_end - &__u_boot_cmd_start));
+#endif /* !defined(CONFIG_RELOC_FIXUP_WORKS) */

 #if defined(CONFIG_CMD_AMBAPP) && defined(CONFIG_SYS_AMBAPP_PRINT_ON_STARTUP)
 	puts("AMBA:\n");
diff --git a/common/command.c b/common/command.c
index 30a9801..4b7e661 100644
--- a/common/command.c
+++ b/common/command.c
@@ -464,3 +464,40 @@ int cmd_get_data_size(char* arg, int default_size)
 	return default_size;
 }
 #endif
+
+#if !defined(CONFIG_RELOC_FIXUP_WORKS)
+DECLARE_GLOBAL_DATA_PTR;
+
+void fixup_cmdtable(cmd_tbl_t *cmdtp, int size)
+{
+	int	i;
+
+	if (gd->reloc_off == 0)
+		return;
+
+	for (i = 0; i < size; i++) {
+		ulong addr;
+
+		addr = (ulong) (cmdtp->cmd) + gd->reloc_off;
+#if DEBUG_COMMANDS
+		printf("Command \"%s\": 0x%08lx => 0x%08lx\n",
+		       cmdtp->name, (ulong) (cmdtp->cmd), addr);
+#endif
+		cmdtp->cmd =
+			(int (*)(struct cmd_tbl_s *, int, int, char * const []))addr;
+		addr = (ulong)(cmdtp->name) + gd->reloc_off;
+		cmdtp->name = (char *)addr;
+		if (cmdtp->usage) {
+			addr = (ulong)(cmdtp->usage) + gd->reloc_off;
+			cmdtp->usage = (char *)addr;
+		}
+#ifdef	CONFIG_SYS_LONGHELP
+		if (cmdtp->help) {
+			addr = (ulong)(cmdtp->help) + gd->reloc_off;
+			cmdtp->help = (char *)addr;
+		}
+#endif
+		cmdtp++;
+	}
+}
+#endif
diff --git a/include/command.h b/include/command.h
index 9144d69..5c14616 100644
--- a/include/command.h
+++ b/include/command.h
@@ -125,4 +125,7 @@ cmd_tbl_t __u_boot_cmd_##name Struct_Section = {#name, maxargs, rep, cmd, usage}

 #endif	/* CONFIG_SYS_LONGHELP */

+#if !defined(CONFIG_RELOC_FIXUP_WORKS)
+void fixup_cmdtable(cmd_tbl_t *cmdtp, int size);
+#endif
 #endif	/* __COMMAND_H */
-- 
1.6.2.5
-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany