minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 12:39:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

ppc4xx: Add support for PPC460EX/460GT rev B chip to AMCC Canyonlands

Browse Source 
This patch is based on a diff created by Phong Vo from AMCC.

Signed-off-by: Phong Vo <pvo@amcc.com>
Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Stefan Roese 2009-07-29 08:46:10 +02:00
parent 89bcc48750
commit c3fa4f0c86
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
board/amcc/canyonlands/canyonlands.c
View File

@ -94,13 +94,23 @@ static inline void board_cpld_write(int offset, int data)
out_8((void *)(CONFIG_SYS_CPLD_ADDR), offset); out_8((void *)(CONFIG_SYS_CPLD_ADDR), offset);
out_8((void *)(CONFIG_SYS_CPLD_DATA), data); out_8((void *)(CONFIG_SYS_CPLD_DATA), data);
} }
#else
static int pvr_460ex(void)
{
u32 pvr = get_pvr();
if ((pvr == PVR_460EX_RA) || (pvr == PVR_460EX_SE_RA) ||
(pvr == PVR_460EX_RB))
return 1;
return 0;
}
#endif /* defined(CONFIG_ARCHES) */ #endif /* defined(CONFIG_ARCHES) */
int board_early_init_f(void) int board_early_init_f(void)
{ {
#if !defined(CONFIG_ARCHES) #if !defined(CONFIG_ARCHES)
u32 sdr0_cust0; u32 sdr0_cust0;
u32 pvr = get_pvr();
#endif #endif
/* /*
@ -175,7 +185,7 @@ int board_early_init_f(void)
mtdcr(AHB_TOP, 0x8000004B); mtdcr(AHB_TOP, 0x8000004B);
mtdcr(AHB_BOT, 0x8000004B); mtdcr(AHB_BOT, 0x8000004B);
if ((pvr == PVR_460EX_RA) || (pvr == PVR_460EX_SE_RA)) { if (pvr_460ex()) {
/* /*
* Configure USB-STP pins as alternate and not GPIO * Configure USB-STP pins as alternate and not GPIO
* It seems to be neccessary to configure the STP pins as GPIO * It seems to be neccessary to configure the STP pins as GPIO
@ -234,17 +244,16 @@ int get_cpu_num(void)
int checkboard(void) int checkboard(void)
{ {
char *s = getenv("serial#"); char *s = getenv("serial#");
u32 pvr = get_pvr();
if ((pvr == PVR_460GT_RA) || (pvr == PVR_460GT_SE_RA)) { if (pvr_460ex()) {
printf("Board: Glacier - AMCC PPC460GT Evaluation Board");
gd->board_type = BOARD_GLACIER;
} else {
printf("Board: Canyonlands - AMCC PPC460EX Evaluation Board"); printf("Board: Canyonlands - AMCC PPC460EX Evaluation Board");
if (in_8((void *)(CONFIG_SYS_BCSR_BASE + 3)) & CONFIG_SYS_BCSR3_PCIE) if (in_8((void *)(CONFIG_SYS_BCSR_BASE + 3)) & CONFIG_SYS_BCSR3_PCIE)
gd->board_type = BOARD_CANYONLANDS_PCIE; gd->board_type = BOARD_CANYONLANDS_PCIE;
else else
gd->board_type = BOARD_CANYONLANDS_SATA; gd->board_type = BOARD_CANYONLANDS_SATA;
} else {
printf("Board: Glacier - AMCC PPC460GT Evaluation Board");
gd->board_type = BOARD_GLACIER;
} }
switch (gd->board_type) { switch (gd->board_type) {
@ -498,7 +507,6 @@ int misc_init_r(void)
{ {
u32 sdr0_srst1 = 0; u32 sdr0_srst1 = 0;
u32 eth_cfg; u32 eth_cfg;
u32 pvr = get_pvr();
u8 val; u8 val;
/* /*
@ -513,7 +521,7 @@ int misc_init_r(void)
/* Set the for 2 RGMII mode */ /* Set the for 2 RGMII mode */
/* GMC0 EMAC4_0, GMC0 EMAC4_1, RGMII Bridge 0 */ /* GMC0 EMAC4_0, GMC0 EMAC4_1, RGMII Bridge 0 */
eth_cfg &= ~SDR0_ETH_CFG_GMC0_BRIDGE_SEL; eth_cfg &= ~SDR0_ETH_CFG_GMC0_BRIDGE_SEL;
if ((pvr == PVR_460EX_RA) || (pvr == PVR_460EX_SE_RA)) if (pvr_460ex())
eth_cfg |= SDR0_ETH_CFG_GMC1_BRIDGE_SEL; eth_cfg |= SDR0_ETH_CFG_GMC1_BRIDGE_SEL;
else else
eth_cfg &= ~SDR0_ETH_CFG_GMC1_BRIDGE_SEL; eth_cfg &= ~SDR0_ETH_CFG_GMC1_BRIDGE_SEL;