#include <commproc.h>
#include <mpc8xx.h>
-/*****************************************************************************\r
- * UPM table for 60ns EDO RAM at 25 MHz bus/external clock\r
- *****************************************************************************/\r
+/*****************************************************************************
+ * UPM table for 60ns EDO RAM at 25 MHz bus/external clock
+ *****************************************************************************/
static const uint edo_60ns_25MHz_tbl[] = {
-\r
-/* single read (offset 0x00 in upm ram) */\r
- 0x0ff3fc04,0x08f3fc04,0x00f3fc04,0x00f3fc00,\r
- 0x33f7fc07,0xfffffc05,0xfffffc05,0xfffffc05,\r
-/* burst read (offset 0x08 in upm ram) */\r
- 0x0ff3fc04,0x08f3fc04,0x00f3fc0c,0x0ff3fc40,\r
- 0x0cf3fc04,0x03f3fc48,0x0cf3fc04,0x03f3fc48,\r
- 0x0cf3fc04,0x03f3fc00,0x3ff7fc07,0xfffffc05,\r
- 0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,\r
-/* single write (offset 0x18 in upm ram) */\r
- 0x0ffffc04,0x08fffc04,0x30fffc00,0xf1fffc07,\r
- 0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,\r
-/* burst write (offset 0x20 in upm ram) */\r
- 0x0ffffc04,0x08fffc00,0x00fffc04,0x03fffc4c,\r
- 0x00fffc00,0x07fffc4c,0x00fffc00,0x0ffffc4c,\r
- 0x00fffc00,0x3ffffc07,0xfffffc05,0xfffffc05,\r
- 0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,\r
-/* refresh (offset 0x30 in upm ram) */\r
- 0xc0fffc04,0x07fffc04,0x0ffffc04,0x0ffffc04,\r
- 0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,\r
- 0xfffffc05,0xfffffc05,0xfffffc05,0xfffffc05,\r
-/* exception (offset 0x3C in upm ram) */\r
- 0xfffffc07,0xfffffc03,0xfffffc05,0xfffffc05,\r
+
+/* 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,
};
-/*****************************************************************************\r
- * Print Board Identity\r
- *****************************************************************************/\r
+/*****************************************************************************
+ * Print Board Identity
+ *****************************************************************************/
int checkboard (void)
{
puts ("Board:"CONFIG_IDENT_STRING"\n");
return (0);
}
-/*****************************************************************************\r
- * Initialize DRAM controller\r
- *****************************************************************************/\r
+/*****************************************************************************
+ * Initialize DRAM controller
+ *****************************************************************************/
long int initdram (int board_type)
{
volatile immap_t *immap = (immap_t *) CFG_IMMR;
* Only initialize memory controller when running from FLASH.
* When running from RAM, don't touch it.
*/
- if ((ulong) initdram & 0xff000000)\r
- {\r
- volatile uint *addr1, *addr2;\r
- uint i, j;\r
+ if ((ulong) initdram & 0xff000000) {
+ volatile uint *addr1, *addr2;
+ uint i, j;
- upmconfig (UPMA, (uint *) edo_60ns_25MHz_tbl,\r
- 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;
- /*\r
- * Do 8 read accesses to DRAM\r
- */\r
- addr1 = (volatile uint*) 0;\r
- addr2 = (volatile uint*) 0x00400000;\r
- for (i=0, j=0; i<8; i++)\r
- j = addr1[0];\r
- \r
- /*\r
- * Now check whether we got 4MB or 16MB populated\r
- */\r
- addr1[0] = 0x12345678;\r
- addr1[1] = 0x9abcdef0;\r
- addr2[0] = 0xfeedc0de;\r
- addr2[1] = 0x47110815;\r
- if (addr1[0] == 0xfeedc0de && addr1[1] == 0x47110815)\r
- {\r
- /* only 4MB populated */\r
- memctl->memc_or2 = -(CFG_DRAM_MAX/4) | OR_CSNT_SAM;\r
- }\r
- }\r
-\r
+ /*
+ * 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);
}
-\r
-/*****************************************************************************\r
- * otherinits after RAM is there and we are relocated to RAM\r
- * note: though this is an int function, nobody cares for the result!\r
- *****************************************************************************/\r
+
+/*****************************************************************************
+ * prepare for FLASH detection
+ *****************************************************************************/
+void flash_preinit(void)
+{
+}
+
+/*****************************************************************************
+ * finalize FLASH setup
+ *****************************************************************************/
+void flash_afterinit(uint bank, ulong start, ulong size)
+{
+}
+
+/*****************************************************************************
+ * 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)
-{\r
- /* read 'factory' part of EEPROM */\r
- uchar buf[81];\r
- uchar *p;\r
- uint length;\r
- uint addr;\r
- uint len;\r
-\r
- /* get length first */\r
- addr = CFG_FACT_OFFSET;\r
- if (eeprom_read (CFG_I2C_FACT_ADDR, addr, buf, 2))\r
- {\r
-bailout:\r
- printf ("cannot read factory configuration\n");\r
- printf ("be sure to set ethaddr yourself!\n");\r
- return 0;\r
- }
- length = buf[0] + (buf[1]<<8);\r
- addr += 2;\r
-\r
- /* sanity check */\r
- if (length < 20 || length > CFG_FACT_SIZE-2)\r
- goto bailout;\r
-\r
- /* read lines */\r
- while (length > 0)\r
- {\r
- /* read one line */\r
- len = length > 80 ? 80 : length;\r
- if (eeprom_read (CFG_I2C_FACT_ADDR, addr, buf, len))\r
- goto bailout;\r
- /* mark end of buffer */\r
- buf[len] = 0;\r
- /* search end of line */\r
- for (p=buf; *p && *p != 0x0a; p++) ;\r
- if (!*p)\r
- goto bailout;\r
- *p++ = 0;\r
- /* advance to next line start */\r
- length -= p-buf;\r
- addr += p-buf;\r
- /*printf ("%s\n", buf);*/\r
- /* search for our specific entry */\r
- if (!strncmp ((char *)buf, "[RLA/lan/Ethernet] ", 19))\r
- {\r
- setenv ("ethaddr", buf+19);
- } \r
- else if (!strncmp ((char *)buf, "[BOARD/SERIAL] ", 15))\r
- {\r
- setenv ("serial#", buf+15);
- } \r
- else if (!strncmp ((char *)buf, "[BOARD/TYPE] ", 13))\r
- {\r
- setenv ("board_id", buf+13);
- } \r
- }\r
+{
+ /* read 'factory' part of EEPROM */
+ extern void read_factory_r (void);
+ read_factory_r ();
+
return (0);
}
-
projects / oweals / u-boot.git / blobdiff