mpc85xx: Enable unique mode registers and dynamic ODT for DDR3

[oweals/u-boot.git] / common / cmd_bmp.c

diff --git a/common/cmd_bmp.c b/common/cmd_bmp.c
index 5ec798c549afb5fb1d9102b310595bc9a777ab21..f2a48f751c24aa3590a2066a9c6fda4739f2ff07 100644 (file)
--- a/common/cmd_bmp.c
+++ b/common/cmd_bmp.c
@@ -102,8 +102,7 @@ static int do_bmp_info(cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[
                addr = simple_strtoul(argv[1], NULL, 16);
                break;
        default:
-               cmd_usage(cmdtp);
-               return 1;
+               return cmd_usage(cmdtp);
        }
 
        return (bmp_info(addr));
@@ -127,8 +126,7 @@ static int do_bmp_display(cmd_tbl_t * cmdtp, int flag, int argc, char * const ar
                y = simple_strtoul(argv[3], NULL, 10);
                break;
        default:
-               cmd_usage(cmdtp);
-               return 1;
+               return cmd_usage(cmdtp);
        }
 
         return (bmp_display(addr, x, y));
@@ -139,6 +137,12 @@ static cmd_tbl_t cmd_bmp_sub[] = {
        U_BOOT_CMD_MKENT(display, 5, 0, do_bmp_display, "", ""),
 };
 
+#ifdef CONFIG_NEEDS_MANUAL_RELOC
+void bmp_reloc(void) {
+       fixup_cmdtable(cmd_bmp_sub, ARRAY_SIZE(cmd_bmp_sub));
+}
+#endif
+
 /*
  * Subroutine:  do_bmp
  *
@@ -159,12 +163,10 @@ static int do_bmp(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
        c = find_cmd_tbl(argv[0], &cmd_bmp_sub[0], ARRAY_SIZE(cmd_bmp_sub));
 
-       if (c) {
+       if (c)
                return  c->cmd(cmdtp, flag, argc, argv);
-       } else {
-               cmd_usage(cmdtp);
-               return 1;
-       }
+       else
+               return cmd_usage(cmdtp);
 }
 
 U_BOOT_CMD(