ppc4xx: Remove redundant ft_board_setup() functions from some 4xx boards

[karo-tx-uboot.git] / lib_sh / board.c

diff --git a/lib_sh/board.c b/lib_sh/board.c
index 2cd60d76be28e4f51c3144abde4d4eb3e4c13044..eb81bd97ec43c1624ce753874102892d61881502 100644 (file)
--- a/lib_sh/board.c
+++ b/lib_sh/board.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007
+ * Copyright (C) 2007,2008
  * Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
  *
  * This program is free software; you can redistribute it and/or
@@ -76,7 +76,7 @@ static int sh_flash_init(void)
 }
 
 #if defined(CONFIG_CMD_NAND)
-void nand_init (void);
+#include <nand.h>
 static int sh_nand_init(void)
 {
        printf("NAND: ");
@@ -95,6 +95,14 @@ static int sh_marubun_init(void)
 }
 #endif /* (CONFIG_CMD_IDE) */
 
+#if defined(CONFIG_PCI)
+static int sh_pci_init(void)
+{
+       pci_init();
+       return 0;
+}
+#endif /* CONFIG_PCI */
+
 static int sh_mem_env_init(void)
 {
        mem_malloc_init();
@@ -104,6 +112,7 @@ static int sh_mem_env_init(void)
        return 0;
 }
 
+#if defined(CONFIG_CMD_NET)
 static int sh_net_init(void)
 {
        DECLARE_GLOBAL_DATA_PTR;
@@ -119,6 +128,7 @@ static int sh_net_init(void)
 
        return 0;
 }
+#endif
 
 typedef int (init_fnc_t) (void);
 
@@ -140,6 +150,9 @@ init_fnc_t *init_sequence[] =
        sh_mem_env_init,
 #if defined(CONFIG_CMD_NAND)
        sh_nand_init,           /* Flash memory (NAND) init */
+#endif
+#if defined(CONFIG_PCI)
+       sh_pci_init,            /* PCI Init */
 #endif
        devices_init,
        console_init_r,
@@ -159,8 +172,8 @@ void sh_generic_init (void)
 
        bd_t *bd;
        init_fnc_t **init_fnc_ptr;
-       char *s;
        int i;
+       char *s;
 
        memset (gd, 0, CFG_GBL_DATA_SIZE);