Signed-off-by: Eric Bénard eric@eukrea.com --- MAKEALL | 1 - board/eukrea/cpuat91/cpuat91.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/MAKEALL b/MAKEALL index 13dde6f..50c0080 100755 --- a/MAKEALL +++ b/MAKEALL @@ -454,7 +454,6 @@ LIST_at91="$(boards_by_soc at91)\ at91sam9g20ek \ at91sam9m10g45ek \ at91sam9rlek \ - CPUAT91 \ pm9g45 \ SBC35_A9G20 \ TNY_A9260 \ diff --git a/board/eukrea/cpuat91/cpuat91.c b/board/eukrea/cpuat91/cpuat91.c index 4c4dad6..fa4b25b 100644 --- a/board/eukrea/cpuat91/cpuat91.c +++ b/board/eukrea/cpuat91/cpuat91.c @@ -63,7 +63,7 @@ int dram_init(void) #ifdef CONFIG_DRIVER_AT91EMAC int board_eth_init(bd_t *bis) { - return at91emac_register(bis, (u32) AT91_EMAC_BASE); + return at91emac_register(bis, (u32) ATMEL_BASE_EMAC); } #endif
@@ -71,8 +71,8 @@ int board_eth_init(bd_t *bis) void i2c_init_board(void) { u32 pin; - at91_pmc_t *pmc = (at91_pmc_t *) AT91_PMC_BASE; - at91_pio_t *pio = (at91_pio_t *) AT91_PIO_BASE; + at91_pmc_t *pmc = (at91_pmc_t *) ATMEL_BASE_PMC; + at91_pio_t *pio = (at91_pio_t *) ATMEL_BASE_PIO;
writel(1 << AT91_ID_PIOA, &pmc->pcer); pin = AT91_PMX_AA_TWD | AT91_PMX_AA_TWCK;