diff options
author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2015-02-05 11:56:23 (GMT) |
---|---|---|
committer | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2015-02-06 15:15:03 (GMT) |
commit | 4431684910217022bad85a0bc931ad9bfb78859f (patch) | |
tree | 81f5b2f61d5f56eec377709e365d1cb95adaf05e /arch/arm/cpu | |
parent | ee470645d169cd0f47f66be8c8f69e061e3665d4 (diff) | |
download | u-boot-4431684910217022bad85a0bc931ad9bfb78859f.tar.xz |
ARM: UniPhier: refactor pinmon command
The return value of get_boot_mode_sel() is used as the index of
the boot_device_table[] array. Its type should be "int" rather
than "u32".
Use only the iterator "i" for the loop in do_pinmon().
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r-- | arch/arm/cpu/armv7/uniphier/cmd_pinmon.c | 15 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/uniphier/ph1-pro4/boot-mode.c | 4 |
2 files changed, 8 insertions, 11 deletions
diff --git a/arch/arm/cpu/armv7/uniphier/cmd_pinmon.c b/arch/arm/cpu/armv7/uniphier/cmd_pinmon.c index 3561b40..d8a6361 100644 --- a/arch/arm/cpu/armv7/uniphier/cmd_pinmon.c +++ b/arch/arm/cpu/armv7/uniphier/cmd_pinmon.c @@ -11,20 +11,17 @@ static int do_pinmon(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - struct boot_device_info *table; - u32 mode_sel, n = 0; - - mode_sel = get_boot_mode_sel(); + int mode_sel, i; printf("Boot Swap: %s\n\n", boot_is_swapped() ? "ON" : "OFF"); + mode_sel = get_boot_mode_sel(); + puts("Boot Mode Pin:\n"); - for (table = boot_device_table; strlen(table->info); table++) { - printf(" %c %02x %s\n", n == mode_sel ? '*' : ' ', n, - table->info); - n++; - } + for (i = 0; strlen(boot_device_table[i].info); i++) + printf(" %c %02x %s\n", i == mode_sel ? '*' : ' ', i, + boot_device_table[i].info); return 0; } diff --git a/arch/arm/cpu/armv7/uniphier/ph1-pro4/boot-mode.c b/arch/arm/cpu/armv7/uniphier/ph1-pro4/boot-mode.c index 33bccff..90d4186 100644 --- a/arch/arm/cpu/armv7/uniphier/ph1-pro4/boot-mode.c +++ b/arch/arm/cpu/armv7/uniphier/ph1-pro4/boot-mode.c @@ -48,14 +48,14 @@ struct boot_device_info boot_device_table[] = { {BOOT_DEVICE_NONE, ""} }; -u32 get_boot_mode_sel(void) +int get_boot_mode_sel(void) { return (readl(SG_PINMON0) >> 1) & 0x1f; } u32 spl_boot_device(void) { - u32 boot_mode; + int boot_mode; if (boot_is_swapped()) return BOOT_DEVICE_NOR; |