summaryrefslogtreecommitdiff
path: root/board/atmel
diff options
context:
space:
mode:
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2008-08-31 18:46:35 +0200
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2008-09-01 14:21:35 +0200
commit25e6854d42c11046a468576179b5494f850311b2 (patch)
tree8d082bde626cae091c6d3f8b0b18d7f3d32ed08b /board/atmel
parent36d375faf5cff98e8dca32aabbbb1ec6036437dd (diff)
downloadu-boot-imx-25e6854d42c11046a468576179b5494f850311b2.zip
u-boot-imx-25e6854d42c11046a468576179b5494f850311b2.tar.gz
u-boot-imx-25e6854d42c11046a468576179b5494f850311b2.tar.bz2
avr32: use board_early_init_r instead of board_init_info
Replace the avr32-specific board_init_info hook by the standard board_early_init_r hook and make it optional. board_early_init_r() runs somewhat earlier than board_init_info used to do, but this isn't a problem for any of the in-tree boards. Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Diffstat (limited to 'board/atmel')
-rw-r--r--board/atmel/atngw100/atngw100.c3
-rw-r--r--board/atmel/atstk1000/atstk1000.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/board/atmel/atngw100/atngw100.c b/board/atmel/atngw100/atngw100.c
index 03544aa..480d525 100644
--- a/board/atmel/atngw100/atngw100.c
+++ b/board/atmel/atngw100/atngw100.c
@@ -88,10 +88,11 @@ phys_size_t initdram(int board_type)
return actual_size;
}
-void board_init_info(void)
+int board_early_init_r(void)
{
gd->bd->bi_phy_id[0] = 0x01;
gd->bd->bi_phy_id[1] = 0x03;
+ return 0;
}
extern int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);
diff --git a/board/atmel/atstk1000/atstk1000.c b/board/atmel/atstk1000/atstk1000.c
index cc400a9..7be3993 100644
--- a/board/atmel/atstk1000/atstk1000.c
+++ b/board/atmel/atstk1000/atstk1000.c
@@ -110,10 +110,11 @@ phys_size_t initdram(int board_type)
return actual_size;
}
-void board_init_info(void)
+int board_early_init_r(void)
{
gd->bd->bi_phy_id[0] = 0x10;
gd->bd->bi_phy_id[1] = 0x11;
+ return 0;
}
extern int macb_eth_initialize(int id, void *regs, unsigned int phy_addr);