Merge branch 'master' of git://www.denx.de/git/u-boot-ppc4xx

[u-boot] / board / ixdp425 / ixdp425.c

diff --git a/board/ixdp425/ixdp425.c b/board/ixdp425/ixdp425.c
index aa965914507ae59e9c79eede6152089c02a710f7..e0d763780e523c2942f79be1a32f7a5ba2d380c5 100644 (file)
--- a/board/ixdp425/ixdp425.c
+++ b/board/ixdp425/ixdp425.c
@@ -1,4 +1,7 @@
 /*
+ * (C) Copyright 2006
+ * Stefan Roese, DENX Software Engineering, sr@denx.de.
+ *
  * (C) Copyright 2002
  * Kyle Harris, Nexus Technologies, Inc. kharris@nexus-tech.net
  *
@@ -25,24 +28,16 @@
  * MA 02111-1307 USA
  */
 
-#include <asm/arch/ixp425.h>
 #include <common.h>
+#include <command.h>
+#include <malloc.h>
+#include <asm/arch/ixp425.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
 /*
  * Miscelaneous platform dependent initialisations
  */
-
-/**********************************************************/
-
-int board_post_init (void)
-{
-       return (0);
-}
-
-/**********************************************************/
-
 int board_init (void)
 {
        /* arch number of IXDP */
@@ -51,10 +46,58 @@ int board_init (void)
        /* adress of boot parameters */
        gd->bd->bi_boot_params = 0x00000100;
 
+#ifdef CONFIG_IXDPG425
+       /* arch number of IXDP */
+       gd->bd->bi_arch_number = MACH_TYPE_IXDPG425;
+
+       /*
+        * Get realtek RTL8305 switch and SLIC out of reset
+        */
+       GPIO_OUTPUT_SET(CFG_GPIO_SWITCH_RESET_N);
+       GPIO_OUTPUT_ENABLE(CFG_GPIO_SWITCH_RESET_N);
+       GPIO_OUTPUT_SET(CFG_GPIO_SLIC_RESET_N);
+       GPIO_OUTPUT_ENABLE(CFG_GPIO_SLIC_RESET_N);
+
+       /*
+        * Setup GPIO's for PCI INTA & INTB
+        */
+       GPIO_OUTPUT_DISABLE(CFG_GPIO_PCI_INTA_N);
+       GPIO_INT_ACT_LOW_SET(CFG_GPIO_PCI_INTA_N);
+       GPIO_OUTPUT_DISABLE(CFG_GPIO_PCI_INTB_N);
+       GPIO_INT_ACT_LOW_SET(CFG_GPIO_PCI_INTB_N);
+
+       /*
+        * Setup GPIO's for 33MHz clock output
+        */
+       *IXP425_GPIO_GPCLKR = 0x01FF01FF;
+       GPIO_OUTPUT_ENABLE(CFG_GPIO_PCI_CLK);
+       GPIO_OUTPUT_ENABLE(CFG_GPIO_EXTBUS_CLK);
+#endif
+
        return 0;
 }
 
-/**********************************************************/
+/*
+ * Check Board Identity
+ */
+int checkboard(void)
+{
+       char *s = getenv("serial#");
+
+#ifdef CONFIG_IXDPG425
+       puts("Board: IXDPG425 - Intel Network Gateway Reference Platform");
+#else
+       puts("Board: IXDP425 - Intel Development Platform");
+#endif
+
+       if (s != NULL) {
+               puts(", serial# ");
+               puts(s);
+       }
+       putc('\n');
+
+       return (0);
+}
 
 int dram_init (void)
 {
@@ -64,8 +107,7 @@ int dram_init (void)
        return (0);
 }
 
-/**********************************************************/
-
+#if defined(CONFIG_CMD_PCI) || defined(CONFIG_PCI)
 extern struct pci_controller hose;
 extern void pci_ixp_init(struct pci_controller * hose);
 
@@ -75,3 +117,4 @@ void pci_init_board(void)
 
        pci_ixp_init(&hose);
 }
+#endif