summaryrefslogtreecommitdiffstats
path: root/arch/arm/imx-common/cmd_bmode.c
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2012-10-12 10:27:04 +0000
committerTom Rini <trini@ti.com>2012-10-22 08:29:42 -0700
commit6c7c946cadfafdea80eb930e3181085b907a0362 (patch)
treee543b723570968ee74841b52336f41ac1631edce /arch/arm/imx-common/cmd_bmode.c
parent556751427b9b79266918e87f7399e1a6eea60096 (diff)
downloadtalos-obmc-uboot-6c7c946cadfafdea80eb930e3181085b907a0362.tar.gz
talos-obmc-uboot-6c7c946cadfafdea80eb930e3181085b907a0362.zip
common: Convert the U-Boot commands to LG-arrays
This patch converts the old method of creating a list of command onto the new LG-arrays code. The old u_boot_cmd section is converted to new u_boot_list_cmd subsection and LG-array macros used as needed. Minor adjustments had to be made to the common code to work with the LG-array macros, mostly the fixup_cmdtable() calls are now passed the ll_entry_start and ll_entry_count instead of linker-generated symbols. The command.c had to be adjusted as well so it would use the newly introduced LG-array API instead of directly using linker-generated symbols. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Joe Hershberger <joe.hershberger@gmail.com> Cc: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/arm/imx-common/cmd_bmode.c')
-rw-r--r--arch/arm/imx-common/cmd_bmode.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/imx-common/cmd_bmode.c b/arch/arm/imx-common/cmd_bmode.c
index 02fe72ed7f..ddc14b099e 100644
--- a/arch/arm/imx-common/cmd_bmode.c
+++ b/arch/arm/imx-common/cmd_bmode.c
@@ -24,6 +24,7 @@
#include <asm/io.h>
#include <asm/imx-common/boot_mode.h>
#include <malloc.h>
+#include <command.h>
static const struct boot_mode *modes[2];
@@ -103,9 +104,11 @@ void add_board_boot_modes(const struct boot_mode *p)
int size;
char *dest;
- if (__u_boot_cmd_bmode.usage) {
- free(__u_boot_cmd_bmode.usage);
- __u_boot_cmd_bmode.usage = NULL;
+ cmd_tbl_t *entry = ll_entry_get(cmd_tbl_t, bmode, cmd);
+
+ if (entry->usage) {
+ free(entry->usage);
+ entry->usage = NULL;
}
modes[0] = p;
@@ -114,6 +117,6 @@ void add_board_boot_modes(const struct boot_mode *p)
dest = malloc(size);
if (dest) {
create_usage(dest);
- __u_boot_cmd_bmode.usage = dest;
+ entry->usage = dest;
}
}
OpenPOWER on IntegriCloud