redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

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>
utp
Masahiro Yamada 2015-02-05 20:56:23 +09:00
parent ee470645d1
commit 4431684910
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm/cpu/armv7/uniphier/cmd_pinmon.c
View File

@ -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;
}

4
arch/arm/cpu/armv7/uniphier/ph1-pro4/boot-mode.c
View File

@ -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;

2
arch/arm/include/asm/arch-uniphier/boot-device.h
View File

@ -8,7 +8,7 @@
#ifndef _ASM_BOOT_DEVICE_H_
#define _ASM_BOOT_DEVICE_H_
u32 get_boot_mode_sel(void);
int get_boot_mode_sel(void);
struct boot_device_info {
u32 type;