diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-06-07 23:41:03 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-06-07 23:41:03 +0200 |
| commit | 74b5b5dbc3345a8fad4bc798f8f88d07d2ef0008 (patch) | |
| tree | 474bc1734337eea4ffe7a5d64a4102185d7c0b42 | |
| parent | d1c6e9e44a7218b390962e90ed462a134564676f (diff) | |
| parent | d3a105a26f89ba9f43800f9452907e01b8211da5 (diff) | |
| download | u-boot-imx-74b5b5dbc3345a8fad4bc798f8f88d07d2ef0008.zip u-boot-imx-74b5b5dbc3345a8fad4bc798f8f88d07d2ef0008.tar.gz u-boot-imx-74b5b5dbc3345a8fad4bc798f8f88d07d2ef0008.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-avr32
* 'master' of git://git.denx.de/u-boot-avr32:
avr32:board.c: fix compile warning
avr32:grasshopper: fix PHY initialisation
Signed-off-by: Wolfgang Denk <wd@denx.de>
| -rw-r--r-- | arch/avr32/lib/board.c | 1 | ||||
| -rw-r--r-- | board/in-circuit/grasshopper/grasshopper.c | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/avr32/lib/board.c b/arch/avr32/lib/board.c index b390a6c..d7a64b4 100644 --- a/arch/avr32/lib/board.c +++ b/arch/avr32/lib/board.c @@ -254,7 +254,6 @@ void board_init_r(gd_t *new_gd, ulong dest_addr) #ifndef CONFIG_ENV_IS_NOWHERE extern char * env_name_spec; #endif - char *s; bd_t *bd; gd = new_gd; diff --git a/board/in-circuit/grasshopper/grasshopper.c b/board/in-circuit/grasshopper/grasshopper.c index 475a759..222fe43 100644 --- a/board/in-circuit/grasshopper/grasshopper.c +++ b/board/in-circuit/grasshopper/grasshopper.c @@ -72,6 +72,13 @@ int board_early_init_f(void) portmux_enable_usart0(PORTMUX_DRIVE_MIN); portmux_enable_usart1(PORTMUX_DRIVE_MIN); #if defined(CONFIG_MACB) + /* set PHY reset and pwrdown to low */ + portmux_select_gpio(PORTMUX_PORT_B, (1 << 29) | (1 << 30), + PORTMUX_DIR_OUTPUT | PORTMUX_INIT_LOW); + udelay(100); + /* release PHYs reset */ + gpio_set_value(GPIO_PIN_PB(29), 1); + portmux_enable_macb0(PORTMUX_MACB_MII, PORTMUX_DRIVE_LOW); #endif |