GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 06:31:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of git://git.denx.de/u-boot-avr32

Browse source 
* '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>
This commit is contained in:
Wolfgang Denk 2012-06-07 23:41:03 +02:00
commit 74b5b5dbc3
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/avr32/lib/board.c
View file

@ -254,7 +254,6 @@ void board_init_r(gd_t *new_gd, ulong dest_addr)
#ifndef CONFIG_ENV_IS_NOWHERE #ifndef CONFIG_ENV_IS_NOWHERE
extern char * env_name_spec; extern char * env_name_spec;
#endif #endif
char *s;
bd_t *bd; bd_t *bd;
gd = new_gd; gd = new_gd;

7
board/in-circuit/grasshopper/grasshopper.c
View file

@ -72,6 +72,13 @@ int board_early_init_f(void)
portmux_enable_usart0(PORTMUX_DRIVE_MIN); portmux_enable_usart0(PORTMUX_DRIVE_MIN);
portmux_enable_usart1(PORTMUX_DRIVE_MIN); portmux_enable_usart1(PORTMUX_DRIVE_MIN);
#if defined(CONFIG_MACB) #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); portmux_enable_macb0(PORTMUX_MACB_MII, PORTMUX_DRIVE_LOW);
#endif #endif