LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Lite500B support: Merge with /home/raj/git/u-boot.l5200b_pci

This commit is contained in:
Wolfgang Denk 2006-04-06 10:42:23 +02:00
parent 71b405df4e b66a938342
commit 9bc97a3d91
4 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
board/icecube/icecube.c
View File

@ -27,6 +27,7 @@
#include <common.h> #include <common.h>
#include <mpc5xxx.h> #include <mpc5xxx.h>
#include <pci.h> #include <pci.h>
#include <asm/processor.h>
#if defined(CONFIG_LITE5200B) #if defined(CONFIG_LITE5200B)
#include "mt46v32m16.h" #include "mt46v32m16.h"
@ -89,6 +90,8 @@ long int initdram (int board_type)
{ {
ulong dramsize = 0; ulong dramsize = 0;
ulong dramsize2 = 0; ulong dramsize2 = 0;
uint svr, pvr;
#ifndef CFG_RAMBOOT #ifndef CFG_RAMBOOT
ulong test1, test2; ulong test1, test2;
@ -183,6 +186,24 @@ long int initdram (int board_type)
#endif /* CFG_RAMBOOT */ #endif /* CFG_RAMBOOT */
/*
* On MPC5200B we need to set the special configuration delay in the
* DDR controller. Please refer to Freescale's AN3221 "MPC5200B SDRAM
* Initialization and Configuration", 3.3.1 SDelay--MBAR + 0x0190:
*
* "The SDelay should be written to a value of 0x00000004. It is
* required to account for changes caused by normal wafer processing
* parameters."
*/
svr = get_svr();
pvr = get_pvr();
if ((SVR_MJREV(svr) >= 2) &&
(PVR_MAJ(pvr) == 1) && (PVR_MIN(pvr) == 4)) {
*(vu_long *)MPC5XXX_SDRAM_SDELAY = 0x04;
__asm__ volatile ("sync");
}
return dramsize + dramsize2; return dramsize + dramsize2;
} }

8
cpu/mpc5xxx/cpu.c
View File

@ -38,7 +38,7 @@ int checkcpu (void)
ulong clock = gd->cpu_clk; ulong clock = gd->cpu_clk;
char buf[32]; char buf[32];
#ifndef CONFIG_MGT5100 #ifndef CONFIG_MGT5100
uint svr; uint svr, pvr;
#endif #endif
puts ("CPU: "); puts ("CPU: ");
@ -48,6 +48,7 @@ int checkcpu (void)
printf (" (JTAG ID %08lx)", *(vu_long *)MPC5XXX_CDM_JTAGID); printf (" (JTAG ID %08lx)", *(vu_long *)MPC5XXX_CDM_JTAGID);
#else #else
svr = get_svr(); svr = get_svr();
pvr = get_pvr();
switch (SVR_VER (svr)) { switch (SVR_VER (svr)) {
case SVR_MPC5200: case SVR_MPC5200:
printf ("MPC5200"); printf ("MPC5200");
@ -57,11 +58,10 @@ int checkcpu (void)
break; break;
} }
printf (" v%d.%d", SVR_MJREV (svr), SVR_MNREV (svr)); printf (" v%d.%d, Core v%d.%d", SVR_MJREV (svr), SVR_MNREV (svr),
PVR_MAJ(pvr), PVR_MIN(pvr));
#endif #endif
printf (" at %s MHz\n", strmhz (buf, clock)); printf (" at %s MHz\n", strmhz (buf, clock));
return 0; return 0;
} }

8
include/configs/IceCube.h
View File

@ -56,7 +56,9 @@
* 0x40000000 - 0x4fffffff - PCI Memory * 0x40000000 - 0x4fffffff - PCI Memory
* 0x50000000 - 0x50ffffff - PCI IO Space * 0x50000000 - 0x50ffffff - PCI IO Space
*/ */
#define CONFIG_PCI 1 #define CONFIG_PCI
#if defined(CONFIG_PCI)
#define CONFIG_PCI_PNP 1 #define CONFIG_PCI_PNP 1
#define CONFIG_PCI_SCAN_SHOW 1 #define CONFIG_PCI_SCAN_SHOW 1
@ -67,6 +69,8 @@
#define CONFIG_PCI_IO_BUS 0x50000000 #define CONFIG_PCI_IO_BUS 0x50000000
#define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS #define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS
#define CONFIG_PCI_IO_SIZE 0x01000000 #define CONFIG_PCI_IO_SIZE 0x01000000
#define ADD_PCI_CMD CFG_CMD_PCI
#endif
#define CFG_XLB_PIPELINING 1 #define CFG_XLB_PIPELINING 1
@ -76,8 +80,6 @@
#define CFG_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */ #define CFG_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */
#define CONFIG_NS8382X 1 #define CONFIG_NS8382X 1
#define ADD_PCI_CMD CFG_CMD_PCI
#else /* MPC5100 */ #else /* MPC5100 */
#define CONFIG_MII 1 #define CONFIG_MII 1

1
include/mpc5xxx.h
View File

@ -131,6 +131,7 @@
#if defined(CONFIG_MGT5100) #if defined(CONFIG_MGT5100)
#define MPC5XXX_SDRAM_XLBSEL (MPC5XXX_SDRAM + 0x0010) #define MPC5XXX_SDRAM_XLBSEL (MPC5XXX_SDRAM + 0x0010)
#endif #endif
#define MPC5XXX_SDRAM_SDELAY (MPC5XXX_SDRAM + 0x0090)
/* Clock Distribution Module */ /* Clock Distribution Module */
#define MPC5XXX_CDM_JTAGID (MPC5XXX_CDM + 0x0000) #define MPC5XXX_CDM_JTAGID (MPC5XXX_CDM + 0x0000)