* Code cleanup:

  - remove trailing white space, trailing empty lines, C++ comments, etc.
  - split cmd_boot.c (separate cmd_bdinfo.c and cmd_load.c)

* Patches by Kenneth Johansson, 25 Jun 2003:
  - major rework of command structure
    (work done mostly by Michal Cendrowski and Joakim Kristiansen)

1 files changed, 111 insertions, 121 deletions

diff --git a/board/emk/top860/top860.c b/board/emk/top860/top860.c
index b99bf0e..d13be98 100644
--- a/board/emk/top860/top860.c
+++ b/board/emk/top860/top860.c
@@ -35,47 +35,47 @@
 #include <commproc.h>
 #include <mpc8xx.h>
 
-/*****************************************************************************

- * UPM table for 60ns EDO RAM at 25 MHz bus/external clock

- *****************************************************************************/

+/*****************************************************************************
+ * UPM table for 60ns EDO RAM at 25 MHz bus/external clock
+ *****************************************************************************/
 static const uint edo_60ns_25MHz_tbl[] = {
-

-/* single read   (offset 0x00 in upm ram) */

-    0x0ff3fc04,0x08f3fc04,0x00f3fc04,0x00f3fc00,

-    0x33f7fc07,0xfffffc05,0xfffffc05,0xfffffc05,

-/* burst read    (offset 0x08 in upm ram) */

-    0x0ff3fc04,0x08f3fc04,0x00f3fc0c,0x0ff3fc40,

-    0x0cf3fc04,0x03f3fc48,0x0cf3fc04,0x03f3fc48,

-    0x0cf3fc04,0x03f3fc00,0x3ff7fc07,0xfffffc05,

-    0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,

-/* single write  (offset 0x18 in upm ram) */

-    0x0ffffc04,0x08fffc04,0x30fffc00,0xf1fffc07,

-    0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,

-/* burst write   (offset 0x20 in upm ram) */

-    0x0ffffc04,0x08fffc00,0x00fffc04,0x03fffc4c,

-    0x00fffc00,0x07fffc4c,0x00fffc00,0x0ffffc4c,

-    0x00fffc00,0x3ffffc07,0xfffffc05,0xfffffc05,

-    0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,

-/* refresh       (offset 0x30 in upm ram) */

-    0xc0fffc04,0x07fffc04,0x0ffffc04,0x0ffffc04,

-    0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,

-    0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,

-/* exception     (offset 0x3C in upm ram) */

-    0xfffffc07,0xfffffc03,0xfffffc05,0xfffffc05,

+
+/* single read   (offset 0x00 in upm ram) */
+    0x0ff3fc04,0x08f3fc04,0x00f3fc04,0x00f3fc00,
+    0x33f7fc07,0xfffffc05,0xfffffc05,0xfffffc05,
+/* burst read    (offset 0x08 in upm ram) */
+    0x0ff3fc04,0x08f3fc04,0x00f3fc0c,0x0ff3fc40,
+    0x0cf3fc04,0x03f3fc48,0x0cf3fc04,0x03f3fc48,
+    0x0cf3fc04,0x03f3fc00,0x3ff7fc07,0xfffffc05,
+    0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,
+/* single write  (offset 0x18 in upm ram) */
+    0x0ffffc04,0x08fffc04,0x30fffc00,0xf1fffc07,
+    0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,
+/* burst write   (offset 0x20 in upm ram) */
+    0x0ffffc04,0x08fffc00,0x00fffc04,0x03fffc4c,
+    0x00fffc00,0x07fffc4c,0x00fffc00,0x0ffffc4c,
+    0x00fffc00,0x3ffffc07,0xfffffc05,0xfffffc05,
+    0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,
+/* refresh       (offset 0x30 in upm ram) */
+    0xc0fffc04,0x07fffc04,0x0ffffc04,0x0ffffc04,
+    0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,
+    0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,
+/* exception     (offset 0x3C in upm ram) */
+    0xfffffc07,0xfffffc03,0xfffffc05,0xfffffc05,
 };
 
-/*****************************************************************************

- * Print Board Identity

- *****************************************************************************/

+/*****************************************************************************
+ * Print Board Identity
+ *****************************************************************************/
 int checkboard (void)
 {
 	puts ("Board:"CONFIG_IDENT_STRING"\n");
 	return (0);
 }
 
-/*****************************************************************************

- * Initialize DRAM controller

- *****************************************************************************/

+/*****************************************************************************
+ * Initialize DRAM controller
+ *****************************************************************************/
 long int initdram (int board_type)
 {
 	volatile immap_t *immap = (immap_t *) CFG_IMMR;
@@ -85,103 +85,93 @@ long int initdram (int board_type)
 	 * Only initialize memory controller when running from FLASH.
 	 * When running from RAM, don't touch it.
 	 */
-	if ((ulong) initdram & 0xff000000)

-	{

-		volatile uint	*addr1, *addr2;

-		uint			i, j;

+	if ((ulong) initdram & 0xff000000) {
+		volatile uint *addr1, *addr2;
+		uint i, j;
 
-		upmconfig (UPMA, (uint *) edo_60ns_25MHz_tbl,

-			sizeof (edo_60ns_25MHz_tbl) / sizeof (uint));
+		upmconfig (UPMA, (uint *) edo_60ns_25MHz_tbl,
+			   sizeof (edo_60ns_25MHz_tbl) / sizeof (uint));
 		memctl->memc_mptpr = 0x0200;
 		memctl->memc_mamr = 0x0ca20330;
 		memctl->memc_or2 = -CFG_DRAM_MAX | OR_CSNT_SAM;
 		memctl->memc_br2 = CFG_DRAM_BASE | BR_MS_UPMA | BR_V;
-		/*

-		 * Do 8 read accesses to DRAM

-		 */

-		addr1 = (volatile uint*) 0;

-		addr2 = (volatile uint*) 0x00400000;

-		for (i=0, j=0; i<8; i++)

-			j = addr1[0];

-		

-		/*

-		 * Now check whether we got 4MB or 16MB populated

-		 */

-		addr1[0] = 0x12345678;

-		addr1[1] = 0x9abcdef0;

-		addr2[0] = 0xfeedc0de;

-		addr2[1] = 0x47110815;

-		if (addr1[0] == 0xfeedc0de && addr1[1] == 0x47110815)

-		{

-			/* only 4MB populated */

-			memctl->memc_or2 = -(CFG_DRAM_MAX/4) | OR_CSNT_SAM;

-		}

-	}

-

+		/*
+		 * Do 8 read accesses to DRAM
+		 */
+		addr1 = (volatile uint *) 0;
+		addr2 = (volatile uint *) 0x00400000;
+		for (i = 0, j = 0; i < 8; i++)
+			j = addr1[0];
+
+		/*
+		 * Now check whether we got 4MB or 16MB populated
+		 */
+		addr1[0] = 0x12345678;
+		addr1[1] = 0x9abcdef0;
+		addr2[0] = 0xfeedc0de;
+		addr2[1] = 0x47110815;
+		if (addr1[0] == 0xfeedc0de && addr1[1] == 0x47110815) {
+			/* only 4MB populated */
+			memctl->memc_or2 = -(CFG_DRAM_MAX / 4) | OR_CSNT_SAM;
+		}
+	}
+
 	return -(memctl->memc_or2 & 0xffff0000);
 }
-

-/*****************************************************************************

- * otherinits after RAM is there and we are relocated to RAM

- * note: though this is an int function, nobody cares for the result!

- *****************************************************************************/

+
+/*****************************************************************************
+ * otherinits after RAM is there and we are relocated to RAM
+ * note: though this is an int function, nobody cares for the result!
+ *****************************************************************************/
 int misc_init_r (void)
-{

-	/* read 'factory' part of EEPROM */

-	uchar				buf[81];

-	uchar				*p;

-	uint				length;

-	uint				addr;

-	uint				len;

-

-	/* get length first */

-	addr = CFG_FACT_OFFSET;

-	if (eeprom_read (CFG_I2C_FACT_ADDR, addr, buf, 2))

-	{

-bailout:

-		printf ("cannot read factory configuration\n");

-		printf ("be sure to set ethaddr	yourself!\n");

-		return 0;

+{
+	/* read 'factory' part of EEPROM */
+	uchar buf[81];
+	uchar *p;
+	uint length;
+	uint addr;
+	uint len;
+
+	/* get length first */
+	addr = CFG_FACT_OFFSET;
+	if (eeprom_read (CFG_I2C_FACT_ADDR, addr, buf, 2)) {
+	  bailout:
+		printf ("cannot read factory configuration\n");
+		printf ("be sure to set ethaddr	yourself!\n");
+		return 0;
+	}
+	length = buf[0] + (buf[1] << 8);
+	addr += 2;
+
+	/* sanity check */
+	if (length < 20 || length > CFG_FACT_SIZE - 2)
+		goto bailout;
+
+	/* read lines */
+	while (length > 0) {
+		/* read one line */
+		len = length > 80 ? 80 : length;
+		if (eeprom_read (CFG_I2C_FACT_ADDR, addr, buf, len))
+			goto bailout;
+		/* mark end of buffer */
+		buf[len] = 0;
+		/* search end of line */
+		for (p = buf; *p && *p != 0x0a; p++);
+		if (!*p)
+			goto bailout;
+		*p++ = 0;
+		/* advance to next line start */
+		length -= p - buf;
+		addr += p - buf;
+		/*printf ("%s\n", buf); */
+		/* search for our specific entry */
+		if (!strncmp ((char *) buf, "[RLA/lan/Ethernet] ", 19)) {
+			setenv ("ethaddr", buf + 19);
+		} else if (!strncmp ((char *) buf, "[BOARD/SERIAL] ", 15)) {
+			setenv ("serial#", buf + 15);
+		} else if (!strncmp ((char *) buf, "[BOARD/TYPE] ", 13)) {
+			setenv ("board_id", buf + 13);
+		}
 	}
-	length = buf[0] + (buf[1]<<8);

-	addr += 2;

-

-	/* sanity check */

-	if (length < 20 || length > CFG_FACT_SIZE-2)

-		goto bailout;

-

-	/* read lines */

-	while (length > 0)

-	{

-		/* read one line */

-		len = length > 80 ? 80 : length;

-		if (eeprom_read (CFG_I2C_FACT_ADDR, addr, buf, len))

-			goto bailout;

-		/* mark end of buffer */

-		buf[len] = 0;

-		/* search end of line */

-		for (p=buf; *p && *p != 0x0a; p++) ;

-		if (!*p)

-			goto bailout;

-		*p++ = 0;

-		/* advance to next line start */

-		length -= p-buf;

-		addr += p-buf;

-		/*printf ("%s\n", buf);*/

-		/* search for our specific entry */

-		if (!strncmp ((char *)buf, "[RLA/lan/Ethernet] ", 19))

-		{

-			setenv ("ethaddr", buf+19);
-		} 

-		else if (!strncmp ((char *)buf, "[BOARD/SERIAL] ", 15))

-		{

-			setenv ("serial#", buf+15);
-		} 

-		else if (!strncmp ((char *)buf, "[BOARD/TYPE] ", 13))

-		{

-			setenv ("board_id", buf+13);
-		} 

-	}

 	return (0);
 }
-