diff options
Diffstat (limited to 'board/mpl/vcma9')
| -rw-r--r-- | board/mpl/vcma9/cmd_vcma9.c | 10 | ||||
| -rw-r--r-- | board/mpl/vcma9/config.mk | 2 | ||||
| -rw-r--r-- | board/mpl/vcma9/flash.c | 22 | ||||
| -rw-r--r-- | board/mpl/vcma9/vcma9.c | 4 |
4 files changed, 19 insertions, 19 deletions
diff --git a/board/mpl/vcma9/cmd_vcma9.c b/board/mpl/vcma9/cmd_vcma9.c index 8df642d9ba..44b4112554 100644 --- a/board/mpl/vcma9/cmd_vcma9.c +++ b/board/mpl/vcma9/cmd_vcma9.c @@ -61,7 +61,7 @@ int do_vcma9(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) return 0; } #if defined(CONFIG_DRIVER_CS8900) - if (strcmp(argv[1], "cs8900_eeprom") == 0) { + if (strcmp(argv[1], "cs8900") == 0) { if (strcmp(argv[2], "read") == 0) { uchar addr; ushort data; @@ -102,12 +102,12 @@ int do_vcma9(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) /* write checksum word */ cs8900_e2prom_write(addr, (0 - csum) << 8); } else { - printf("\nplease defined 'ethaddr'\n"); + puts("\nplease defined 'ethaddr'\n"); } } else if (strcmp(argv[2], "dump") == 0) { uchar addr = 0, endaddr, csum; ushort data; - printf("Dump of CS8900 config device: "); + puts("Dump of CS8900 config device: "); cs8900_e2prom_read(addr, &data); if ((data & 0xE000) == 0xA000) { endaddr = (data & 0x00FF) / 2; @@ -119,9 +119,9 @@ int do_vcma9(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } printf("\nChecksum: %s", (csum == 0) ? "ok" : "wrong"); } else { - printf("no valid config found"); + puts("no valid config found"); } - printf("\n"); + puts("\n"); } return 0; diff --git a/board/mpl/vcma9/config.mk b/board/mpl/vcma9/config.mk index 942d42ef6a..3698c2450b 100644 --- a/board/mpl/vcma9/config.mk +++ b/board/mpl/vcma9/config.mk @@ -21,4 +21,4 @@ #TEXT_BASE = 0x30F80000 -TEXT_BASE = 0x33F80000 +TEXT_BASE = 0x33F00000 diff --git a/board/mpl/vcma9/flash.c b/board/mpl/vcma9/flash.c index 829396bfd0..35cf260f6a 100644 --- a/board/mpl/vcma9/flash.c +++ b/board/mpl/vcma9/flash.c @@ -133,23 +133,23 @@ void flash_print_info (flash_info_t *info) switch (info->flash_id & FLASH_VENDMASK) { case (AMD_MANUFACT & FLASH_VENDMASK): - printf("AMD: "); + puts("AMD: "); break; default: - printf("Unknown Vendor "); + puts("Unknown Vendor "); break; } switch (info->flash_id & FLASH_TYPEMASK) { case (AMD_ID_LV400B & FLASH_TYPEMASK): - printf("1x Amd29LV400BB (4Mbit)\n"); + puts("1x Amd29LV400BB (4Mbit)\n"); break; case (AMD_ID_LV800B & FLASH_TYPEMASK): - printf("1x Amd29LV800BB (8Mbit)\n"); + puts("1x Amd29LV800BB (8Mbit)\n"); break; default: - printf("Unknown Chip Type\n"); + puts("Unknown Chip Type\n"); goto Done; break; } @@ -157,17 +157,17 @@ void flash_print_info (flash_info_t *info) printf(" Size: %ld MB in %d Sectors\n", info->size >> 20, info->sector_count); - printf(" Sector Start Addresses:"); + puts(" Sector Start Addresses:"); for (i = 0; i < info->sector_count; i++) { if ((i % 5) == 0) { - printf ("\n "); + puts("\n "); } printf (" %08lX%s", info->start[i], info->protect[i] ? " (RO)" : " "); } - printf ("\n"); + puts("\n"); Done: } @@ -272,16 +272,16 @@ int flash_erase (flash_info_t *info, int s_first, int s_last) goto outahere; } - printf("ok.\n"); + puts("ok.\n"); } else /* it was protected */ { - printf("protected!\n"); + puts("protected!\n"); } } if (ctrlc()) - printf("User Interrupt!\n"); + puts("User Interrupt!\n"); outahere: /* allow flash to settle - wait 10 ms */ diff --git a/board/mpl/vcma9/vcma9.c b/board/mpl/vcma9/vcma9.c index 4664488451..db98553439 100644 --- a/board/mpl/vcma9/vcma9.c +++ b/board/mpl/vcma9/vcma9.c @@ -327,13 +327,13 @@ int last_stage_init(void) /*************************************************************************** * some helping routines */ - +#if !CONFIG_USB_KEYBOARD int overwrite_console(void) { /* return TRUE if console should be overwritten */ return 0; } - +#endif /************************************************************************ * Print VCMA9 Info |