diff options
| author | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-03 15:42:25 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@pollux.denx.de> | 2005-10-03 15:42:25 +0200 |
| commit | d843a575d705637cb2d70520070a8671b58e2a76 (patch) | |
| tree | 4bd93ece9d9e96f2346db213c3267ddd4fd287a7 | |
| parent | 5362385ec3c95d79234002de8ed970c653fd7a93 (diff) | |
| parent | 93b17ec382b4b0adcba563786062752f8b3134d6 (diff) | |
| download | u-boot-imx-d843a575d705637cb2d70520070a8671b58e2a76.zip u-boot-imx-d843a575d705637cb2d70520070a8671b58e2a76.tar.gz u-boot-imx-d843a575d705637cb2d70520070a8671b58e2a76.tar.bz2 | |
Merge with /home/wd/git/u-boot/master
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | board/amcc/yellowstone/yellowstone.c | 12 | ||||
| -rw-r--r-- | board/amcc/yosemite/yosemite.c | 12 |
3 files changed, 21 insertions, 6 deletions
@@ -2,6 +2,9 @@ Changes for U-Boot 1.1.4: ====================================================================== +* Change board message on AMCC Yosemite & Yellowstone to common style + Patch by Stefan Roese, 3 Oct 2005 + * Fix compiler warning * Fix FEC PHY addresses for TQM85xx boards diff --git a/board/amcc/yellowstone/yellowstone.c b/board/amcc/yellowstone/yellowstone.c index 982d857..4c0ae21 100644 --- a/board/amcc/yellowstone/yellowstone.c +++ b/board/amcc/yellowstone/yellowstone.c @@ -180,18 +180,24 @@ int misc_init_r (void) int checkboard(void) { sys_info_t sysinfo; + unsigned char *s = getenv("serial#"); get_sys_info(&sysinfo); - printf("Board: AMCC YELLOWSTONE\n"); + printf("Board: Yellowstone - AMCC PPC440GR Evaluation Board"); + if (s != NULL) { + puts(", serial# "); + puts(s); + } + putc('\n'); + printf("\tVCO: %lu MHz\n", sysinfo.freqVCOMhz / 1000000); printf("\tCPU: %lu MHz\n", sysinfo.freqProcessor / 1000000); printf("\tPLB: %lu MHz\n", sysinfo.freqPLB / 1000000); printf("\tOPB: %lu MHz\n", sysinfo.freqOPB / 1000000); - printf("\tPER: %lu MHz\n", sysinfo.freqEPB / 1000000); + printf("\tEPB: %lu MHz\n", sysinfo.freqEPB / 1000000); printf("\tPCI: %lu MHz\n", sysinfo.freqPCI / 1000000); - return (0); } diff --git a/board/amcc/yosemite/yosemite.c b/board/amcc/yosemite/yosemite.c index b50e99a..7190740 100644 --- a/board/amcc/yosemite/yosemite.c +++ b/board/amcc/yosemite/yosemite.c @@ -176,18 +176,24 @@ int misc_init_r (void) int checkboard(void) { sys_info_t sysinfo; + unsigned char *s = getenv("serial#"); get_sys_info(&sysinfo); - printf("Board: AMCC YOSEMITE\n"); + printf("Board: Yosemite - AMCC PPC440EP Evaluation Board"); + if (s != NULL) { + puts(", serial# "); + puts(s); + } + putc('\n'); + printf("\tVCO: %lu MHz\n", sysinfo.freqVCOMhz / 1000000); printf("\tCPU: %lu MHz\n", sysinfo.freqProcessor / 1000000); printf("\tPLB: %lu MHz\n", sysinfo.freqPLB / 1000000); printf("\tOPB: %lu MHz\n", sysinfo.freqOPB / 1000000); - printf("\tPER: %lu MHz\n", sysinfo.freqEPB / 1000000); + printf("\tEPB: %lu MHz\n", sysinfo.freqEPB / 1000000); printf("\tPCI: %lu MHz\n", sysinfo.freqPCI / 1000000); - return (0); } |