summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG3
-rw-r--r--board/amcc/yellowstone/yellowstone.c12
-rw-r--r--board/amcc/yosemite/yosemite.c12
3 files changed, 21 insertions, 6 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f5a16d8..cfea3c0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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 FEC PHY addresses for TQM85xx boards
* Fix uninitialized variable problem in hush shell
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);
}