diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-11-09 00:10:03 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-11-09 00:10:03 +0100 |
| commit | bad4d11221896f9cf10ef6cf4174472b7b73e6ba (patch) | |
| tree | b6a140db0fe845c470412c02ae837e26b997b69f /board/atmel/at91sam9260ek/at91sam9260ek.c | |
| parent | ac4aeb1735404d2d331bd018e8c709e17c7392ad (diff) | |
| parent | 23b7b87a37e8732a0229d52e69f5e7e617834f80 (diff) | |
| download | u-boot-imx-bad4d11221896f9cf10ef6cf4174472b7b73e6ba.zip u-boot-imx-bad4d11221896f9cf10ef6cf4174472b7b73e6ba.tar.gz u-boot-imx-bad4d11221896f9cf10ef6cf4174472b7b73e6ba.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'board/atmel/at91sam9260ek/at91sam9260ek.c')
| -rw-r--r-- | board/atmel/at91sam9260ek/at91sam9260ek.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/board/atmel/at91sam9260ek/at91sam9260ek.c b/board/atmel/at91sam9260ek/at91sam9260ek.c index 372cfb2..ef99b8b 100644 --- a/board/atmel/at91sam9260ek/at91sam9260ek.c +++ b/board/atmel/at91sam9260ek/at91sam9260ek.c @@ -48,19 +48,19 @@ static void at91sam9260ek_serial_hw_init(void) #ifdef CONFIG_USART0 at91_set_A_periph(AT91_PIN_PB4, 1); /* TXD0 */ at91_set_A_periph(AT91_PIN_PB5, 0); /* RXD0 */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US0); + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_US0); #endif #ifdef CONFIG_USART1 at91_set_A_periph(AT91_PIN_PB6, 1); /* TXD1 */ at91_set_A_periph(AT91_PIN_PB7, 0); /* RXD1 */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US1); + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_US1); #endif #ifdef CONFIG_USART2 at91_set_A_periph(AT91_PIN_PB8, 1); /* TXD2 */ at91_set_A_periph(AT91_PIN_PB9, 0); /* RXD2 */ - at91_sys_write(AT91_PMC_PCER, 1 << AT91_ID_US2); + at91_sys_write(AT91_PMC_PCER, 1 << AT91SAM9260_ID_US2); #endif #ifdef CONFIG_USART3 /* DBGU */ @@ -255,7 +255,7 @@ int board_eth_init(bd_t *bis) { int rc = 0; #ifdef CONFIG_MACB - rc = macb_eth_initialize(0, (void *)AT91_BASE_EMAC, 0x00); + rc = macb_eth_initialize(0, (void *)AT91SAM9260_BASE_EMAC, 0x00); #endif return rc; } |