From: Marian Balakowicz <m8@semihalf.com>
Date: Mon, 3 Jul 2006 21:42:36 +0000 (+0200)
Subject: Cleanup config file and bootup output for Yucca board.
X-Git-Tag: v2025.01-rc5-pxa1908~23006^2~3
X-Git-Url: http://git.dujemihanovic.xyz/img/sics.gif?a=commitdiff_plain;h=fe84b48a94beb88a977a88e3d14b6ea882cdc91a;p=u-boot.git

Cleanup config file and bootup output for Yucca board.
---

diff --git a/CHANGELOG b/CHANGELOG
index 7eb78c23a2..8081859c60 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,8 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Cleanup config file and bootup output for Yucca board.
+
 * Fix CONFIG_440_GX define usage.
 
 * Remove autogenerated bmp_logo.h file.
diff --git a/board/amcc/yucca/yucca.c b/board/amcc/yucca/yucca.c
index 8fb4cfa884..1ae3a549b9 100644
--- a/board/amcc/yucca/yucca.c
+++ b/board/amcc/yucca/yucca.c
@@ -541,18 +541,15 @@ int board_early_init_f (void)
 
 int checkboard (void)
 {
-	sys_info_t sysinfo;
-
-	get_sys_info (&sysinfo);
-
-	printf ("Board: AMCC 440SPe Evaluation Board\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 ("\tEPB: %lu MHz\n", sysinfo.freqEPB / 1000000);
-	printf ("\tPCI: %lu MHz\n", sysinfo.freqPCI / 1000000);
-	printf ("\tDDR: %lu MHz\n", sysinfo.freqDDR / 1000000);
+	char *s = getenv("serial#");
+
+	printf("Board: Yucca - AMCC 440SPe Evaluation Board");
+	if (s != NULL) {
+		puts(", serial# ");
+		puts(s);
+	}
+	putc('\n');
+
 	return 0;
 }
 
diff --git a/cpu/ppc4xx/cpu.c b/cpu/ppc4xx/cpu.c
index 6a84b09732..71303bcc49 100644
--- a/cpu/ppc4xx/cpu.c
+++ b/cpu/ppc4xx/cpu.c
@@ -253,11 +253,13 @@ int checkcpu (void)
 		break;
 
 	case PVR_440SPe_RA:
-		puts("SPe 3GA533C");
+		puts("SPe Rev. A");
 		break;
+
 	case PVR_440SPe_RB:
-		puts("SPe 3GB533C");
+		puts("SPe Rev. B");
 		break;
+
 	default:
 		printf (" UNKNOWN (PVR=%08x)", pvr);
 		break;
diff --git a/include/asm-ppc/processor.h b/include/asm-ppc/processor.h
index ea5b0d2b88..44b23f1eb4 100644
--- a/include/asm-ppc/processor.h
+++ b/include/asm-ppc/processor.h
@@ -736,7 +736,7 @@
 #define PVR_440SP_RA	0x53221850
 #define PVR_440SP_RB	0x53221891
 #define PVR_440SPe_RA	0x53421890
-#define PVR_440SPe_RB	0x53521891
+#define PVR_440SPe_RB	0x53421891
 #define PVR_601		0x00010000
 #define PVR_602		0x00050000
 #define PVR_603		0x00030000
diff --git a/include/configs/yucca.h b/include/configs/yucca.h
index 95de1ea0a6..be2e7db176 100644
--- a/include/configs/yucca.h
+++ b/include/configs/yucca.h
@@ -34,7 +34,6 @@
 #define DEBUG
 #undef DEBUG
 
-#define	 CONFIG_IDENT_STRING "\nU_440SPe_V1R01 level06"
 /*-----------------------------------------------------------------------
  * High Level Configuration Options
  *----------------------------------------------------------------------*/
@@ -149,8 +148,8 @@
 #define CONFIG_ENV_OVERWRITE	1
 
 #define CONFIG_BOOTARGS		"console=ttyS0,115200n8 root=/dev/nfs rw"
-#define CONFIG_BOOTCOMMAND	"bootm E7C00000"	/* autoboot command */
-#define CONFIG_BOOTDELAY	-1	/* -1 to disable autoboot */
+#define CONFIG_BOOTCOMMAND	"bootm E7C00000" /* autoboot command	*/
+#define CONFIG_BOOTDELAY	-1	/* -1 to disable autoboot	*/
 
 #define CONFIG_LOADS_ECHO	1	/* echo on for serial download	*/
 #define CFG_LOADS_BAUD_CHANGE	1	/* allow baudrate change	*/
@@ -192,7 +191,7 @@
 	"ramdisk_addr=E7F20000\0"					\
 	"load=tftp 100000 yuca/u-boot.bin\0"				\
 	"update=protect off 2:4-7;era 2:4-7;"				\
-		"cp.b ${fileaddr} fffc0000 ${filesize};"		\
+		"cp.b ${fileaddr} FFFB0000 ${filesize};"		\
 		"setenv filesize;saveenv\0"				\
 	"upd=run load;run update\0"					\
 	""
@@ -267,7 +266,7 @@
 /* General PCI */
 #define CONFIG_PCI			/* include pci support		*/
 #define CONFIG_PCI_PNP		1	/* do pci plug-and-play		*/
-#define CONFIG_PCI_SCAN_SHOW	i	/* show pci devices on startup	*/
+#define CONFIG_PCI_SCAN_SHOW	1	/* show pci devices on startup	*/
 #undef CONFIG_PCI_CONFIG_HOST_BRIDGE
 
 /* Board-specific PCI */