diff options
| author | Dirk Eibach <eibach@gdsys.de> | 2009-07-30 09:36:33 +0200 |
|---|---|---|
| committer | Stefan Roese <sr@denx.de> | 2009-07-30 14:15:25 +0200 |
| commit | 56bdfa961242fc6acaeebc800640a12b28db3899 (patch) | |
| tree | e4d7f7af347c1aa0592dc3694c2d98786b513a47 /board/gdsys | |
| parent | c3fa4f0c8684c862ecd3fb622fab1e17e44e82e1 (diff) | |
| download | talos-obmc-uboot-56bdfa961242fc6acaeebc800640a12b28db3899.tar.gz talos-obmc-uboot-56bdfa961242fc6acaeebc800640a12b28db3899.zip | |
ppc4xx: Remove check for PPC460EX from CompactCenter
Signed-off-by: Dirk Eibach <eibach@gdsys.de>
Signed-off-by: Stefan Roese <sr@denx.de>
Diffstat (limited to 'board/gdsys')
| -rw-r--r-- | board/gdsys/compactcenter/compactcenter.c | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/board/gdsys/compactcenter/compactcenter.c b/board/gdsys/compactcenter/compactcenter.c index 477ef7005a..f448ef9372 100644 --- a/board/gdsys/compactcenter/compactcenter.c +++ b/board/gdsys/compactcenter/compactcenter.c @@ -41,8 +41,6 @@ DECLARE_GLOBAL_DATA_PTR; int board_early_init_f(void) { - u32 pvr = get_pvr(); - /* * Setup the interrupt controller polarities, triggers, etc. */ @@ -95,16 +93,14 @@ int board_early_init_f(void) mtdcr(AHB_TOP, 0x8000004B); mtdcr(AHB_BOT, 0x8000004B); - if ((pvr == PVR_460EX_RA) || (pvr == PVR_460EX_SE_RA)) { - /* - * Configure USB-STP pins as alternate and not GPIO - * It seems to be neccessary to configure the STP pins as GPIO - * input at powerup (perhaps while USB reset is asserted). So - * we configure those pins to their "real" function now. - */ - gpio_config(16, GPIO_OUT, GPIO_ALT1, GPIO_OUT_1); - gpio_config(19, GPIO_OUT, GPIO_ALT1, GPIO_OUT_1); - } + /* + * Configure USB-STP pins as alternate and not GPIO + * It seems to be neccessary to configure the STP pins as GPIO + * input at powerup (perhaps while USB reset is asserted). So + * we configure those pins to their "real" function now. + */ + gpio_config(16, GPIO_OUT, GPIO_ALT1, GPIO_OUT_1); + gpio_config(19, GPIO_OUT, GPIO_ALT1, GPIO_OUT_1); /* Trigger board component reset */ out_le16((void *)CONFIG_SYS_IO_BASE, 0xffff); @@ -250,7 +246,6 @@ int misc_init_r(void) { u32 sdr0_srst1 = 0; u32 eth_cfg; - u32 pvr = get_pvr(); /* * Set EMAC mode/configuration (GMII, SGMII, RGMII...). @@ -264,10 +259,7 @@ int misc_init_r(void) /* Set the for 2 RGMII mode */ /* GMC0 EMAC4_0, GMC0 EMAC4_1, RGMII Bridge 0 */ eth_cfg &= ~SDR0_ETH_CFG_GMC0_BRIDGE_SEL; - if ((pvr == PVR_460EX_RA) || (pvr == PVR_460EX_SE_RA)) - eth_cfg |= SDR0_ETH_CFG_GMC1_BRIDGE_SEL; - else - eth_cfg &= ~SDR0_ETH_CFG_GMC1_BRIDGE_SEL; + eth_cfg |= SDR0_ETH_CFG_GMC1_BRIDGE_SEL; mtsdr(SDR0_ETH_CFG, eth_cfg); /* |
