diff options
author | Wolfgang Denk <wd@pollux.denx.de> | 2007-01-30 17:32:15 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2007-01-30 17:32:15 +0100 |
commit | c105f4c6601b49637c5413afcf65f814d86f8748 (patch) | |
tree | 74d162881710a7c6b4954d2a38dc4b24850c213a /board/amcc/yosemite/yosemite.c | |
parent | d526de33d849b28d4416445fe16af678336d5cb1 (diff) | |
parent | e802594b6fa1b166308820c276b96dc0d7cc731c (diff) | |
download | u-boot-imx-c105f4c6601b49637c5413afcf65f814d86f8748.zip u-boot-imx-c105f4c6601b49637c5413afcf65f814d86f8748.tar.gz u-boot-imx-c105f4c6601b49637c5413afcf65f814d86f8748.tar.bz2 |
Merge with /home/sr/git/u-boot/denx-merge-sr
Diffstat (limited to 'board/amcc/yosemite/yosemite.c')
-rw-r--r-- | board/amcc/yosemite/yosemite.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/board/amcc/yosemite/yosemite.c b/board/amcc/yosemite/yosemite.c index d47219c..c2e12ba 100644 --- a/board/amcc/yosemite/yosemite.c +++ b/board/amcc/yosemite/yosemite.c @@ -65,12 +65,14 @@ int board_early_init_f(void) out32(GPIO1_TSRL, in32(GPIO1_TSRL) & ~0x0000ff00); out32(GPIO1_ISR1L, in32(GPIO1_ISR1L) | 0x00005500); +#ifdef CONFIG_440EP /*setup USB 2.0 */ out32(GPIO1_TCR, in32(GPIO1_TCR) | 0xc0000000); out32(GPIO1_OSRL, in32(GPIO1_OSRL) | 0x50000000); out32(GPIO0_TCR, in32(GPIO0_TCR) | 0xf); out32(GPIO0_OSRH, in32(GPIO0_OSRH) | 0xaa); out32(GPIO0_ISR2H, in32(GPIO0_ISR2H) | 0x00000500); +#endif /*-------------------------------------------------------------------- * Setup the interrupt controller polarities, triggers, etc. @@ -105,8 +107,10 @@ int board_early_init_f(void) /*enable ethernet */ *(unsigned char *)(CFG_BCSR_BASE | 0x08) = 0xf0; +#ifdef CONFIG_440EP /*enable usb 1.1 fs device and remove usb 2.0 reset */ *(unsigned char *)(CFG_BCSR_BASE | 0x09) = 0x00; +#endif /*get rid of flash write protect */ *(unsigned char *)(CFG_BCSR_BASE | 0x07) = 0x00; @@ -171,7 +175,11 @@ int checkboard(void) u8 rev; u8 val; +#ifdef CONFIG_440EP printf("Board: Yosemite - AMCC PPC440EP Evaluation Board"); +#else + printf("Board: Yellowstone - AMCC PPC440GR Evaluation Board"); +#endif rev = *(u8 *)(CFG_CPLD + 0); val = *(u8 *)(CFG_CPLD + 5) & 0x01; |