diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/cmd_bdinfo.c | 15 | ||||
| -rw-r--r-- | common/cmd_bootm.c | 5 | ||||
| -rw-r--r-- | common/cmd_fat.c | 4 | ||||
| -rw-r--r-- | common/console.c | 2 | ||||
| -rw-r--r-- | common/lynxkdi.c | 1 |
5 files changed, 14 insertions, 13 deletions
diff --git a/common/cmd_bdinfo.c b/common/cmd_bdinfo.c index ceffe6a775b..6549be61ff1 100644 --- a/common/cmd_bdinfo.c +++ b/common/cmd_bdinfo.c @@ -55,7 +55,7 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) print_num ("flashoffset", bd->bi_flashoffset ); print_num ("sramstart", bd->bi_sramstart ); print_num ("sramsize", bd->bi_sramsize ); -#if defined(CONFIG_5xx) || defined(CONFIG_8xx) || defined(CONFIG_8260) +#if defined(CONFIG_5xx) || defined(CONFIG_8xx) || defined(CONFIG_8260) || defined(CONFIG_E500) print_num ("immr_base", bd->bi_immr_base ); #endif print_num ("bootflags", bd->bi_bootflags ); @@ -66,13 +66,13 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) print_str ("pci_busfreq", strmhz(buf, bd->bi_pci_busfreq)); #endif #else /* ! CONFIG_405GP, CONFIG_405CR, CONFIG_405EP */ -#if defined(CONFIG_8260) +#if defined(CONFIG_8260) || defined(CONFIG_MPC8560) print_str ("vco", strmhz(buf, bd->bi_vco)); print_str ("sccfreq", strmhz(buf, bd->bi_sccfreq)); print_str ("brgfreq", strmhz(buf, bd->bi_brgfreq)); #endif print_str ("intfreq", strmhz(buf, bd->bi_intfreq)); -#if defined(CONFIG_8260) +#if defined(CONFIG_8260) || defined(CONFIG_MPC8560) print_str ("cpmfreq", strmhz(buf, bd->bi_cpmfreq)); #endif print_str ("busfreq", strmhz(buf, bd->bi_busfreq)); @@ -81,12 +81,19 @@ int do_bdinfo ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) for (i=0; i<6; ++i) { printf ("%c%02X", i ? ':' : ' ', bd->bi_enetaddr[i]); } -#if (defined CONFIG_PN62) || (defined CONFIG_PPCHAMELEONEVB) +#if (defined CONFIG_PN62) || (defined CONFIG_PPCHAMELEONEVB) \ + || (defined CONFIG_MPC8540ADS) || (defined CONFIG_MPC8560ADS) printf ("\neth1addr ="); for (i=0; i<6; ++i) { printf ("%c%02X", i ? ':' : ' ', bd->bi_enet1addr[i]); } #endif /* CONFIG_PN62 */ +#if defined(CONFIG_MPC8540ADS) || defined(CONFIG_MPC8560ADS) + printf ("\neth2addr ="); + for (i=0; i<6; ++i) { + printf ("%c%02X", i ? ':' : ' ', bd->bi_enet2addr[i]); + } +#endif #ifdef CONFIG_HERMES print_str ("ethspeed", strmhz(buf, bd->bi_ethspeed)); #endif diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 8bac1be4601..abdac2385a0 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -558,7 +558,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, /* convert all clock information to MHz */ kbd->bi_intfreq /= 1000000L; kbd->bi_busfreq /= 1000000L; -#if defined(CONFIG_8260) +#if defined(CONFIG_8260) || defined(CONFIG_MPC8560) kbd->bi_cpmfreq /= 1000000L; kbd->bi_brgfreq /= 1000000L; kbd->bi_sccfreq /= 1000000L; @@ -758,7 +758,7 @@ do_bootm_linux (cmd_tbl_t *cmdtp, int flag, SHOW_BOOT_PROGRESS (15); -#ifdef CFG_INIT_RAM_LOCK +#if defined(CFG_INIT_RAM_LOCK) && !defined(CONFIG_E500) unlock_ram_in_cache(); #endif /* @@ -1341,4 +1341,3 @@ do_bootm_lynxkdi (cmd_tbl_t *cmdtp, int flag, } #endif /* CONFIG_LYNXKDI */ - diff --git a/common/cmd_fat.c b/common/cmd_fat.c index c5b3f06fe8a..7bd4b519508 100644 --- a/common/cmd_fat.c +++ b/common/cmd_fat.c @@ -37,8 +37,6 @@ #include <fat.h> - - block_dev_desc_t *get_dev (char* ifname, int dev) { #if (CONFIG_COMMANDS & CFG_CMD_IDE) @@ -121,8 +119,6 @@ int do_fat_fsload (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) } - - U_BOOT_CMD( fatload, 6, 0, do_fat_fsload, "fatload - load binary file from a dos filesystem\n", diff --git a/common/console.c b/common/console.c index da49c968272..629f60b7fe6 100644 --- a/common/console.c +++ b/common/console.c @@ -495,7 +495,7 @@ int console_init_r (void) #ifdef CONFIG_SPLASH_SCREEN /* suppress all output if splash screen is enabled and we have - a bmp to display */ + a bmp to display */ if (getenv("splashimage") != NULL) outputdev = search_device (DEV_FLAGS_OUTPUT, "nulldev"); #endif diff --git a/common/lynxkdi.c b/common/lynxkdi.c index 95df9554f31..14aa175b189 100644 --- a/common/lynxkdi.c +++ b/common/lynxkdi.c @@ -67,4 +67,3 @@ void lynxkdi_boot ( image_header_t *hdr ) #endif #endif /* CONFIG_LYNXKDI */ - |