Merge branch 'mpc86xx'

[oweals/u-boot.git] / board / netstar / netstar.c

diff --git a/board/netstar/netstar.c b/board/netstar/netstar.c
index 62615e5c56e79909d5f5d0ac81f0a2d60b9593b4..d6b620c8ce455eeaf10bcd5519ff6db9258cb576 100644 (file)
--- a/board/netstar/netstar.c
+++ b/board/netstar/netstar.c
@@ -22,12 +22,11 @@
 
 #include <common.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 int board_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        /* arch number of NetStar board */
-       /* TODO: use define from asm/mach-types.h */
        gd->bd->bi_arch_number = 692;
 
        /* adress of boot parameters */
@@ -38,8 +37,6 @@ int board_init(void)
 
 int dram_init(void)
 {
-       DECLARE_GLOBAL_DATA_PTR;
-
        gd->bd->bi_dram[0].start = PHYS_SDRAM_1;
        gd->bd->bi_dram[0].size = PHYS_SDRAM_1_SIZE;
 
@@ -53,15 +50,11 @@ int dram_init(void)
        return 0;
 }
 
-extern void partition_flash(void);
-
 int misc_init_r(void)
 {
        return 0;
 }
 
-extern void nand_init(void);
-
 int board_late_init(void)
 {
        return 0;