]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - board/amcc/canyonlands/canyonlands.c
Move arch/ppc to arch/powerpc
[karo-tx-uboot.git] / board / amcc / canyonlands / canyonlands.c
index 4e3b349ef816622d72c6edb10d122e1c26e37d8b..23874d2667dc6510a71d1a7dd84c5ceda10d8d38 100644 (file)
 #include <ppc440.h>
 #include <libfdt.h>
 #include <fdt_support.h>
+#include <i2c.h>
 #include <asm/processor.h>
 #include <asm/io.h>
 #include <asm/mmu.h>
 #include <asm/4xx_pcie.h>
 #include <asm/gpio.h>
+#include <asm/errno.h>
 
-extern flash_info_t flash_info[CFG_MAX_FLASH_BANKS]; /* info for FLASH chips */
+extern flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */
 
 DECLARE_GLOBAL_DATA_PTR;
 
-#define CFG_BCSR3_PCIE         0x10
+#define CONFIG_SYS_BCSR3_PCIE          0x10
 
 #define BOARD_CANYONLANDS_PCIE 1
 #define BOARD_CANYONLANDS_SATA 2
 #define BOARD_GLACIER          3
+#define BOARD_ARCHES           4
+
+/*
+ * Override the default functions in arch/powerpc/cpu/ppc4xx/44x_spd_ddr2.c with
+ * board specific values.
+ */
+#if defined(CONFIG_ARCHES)
+u32 ddr_wrdtr(u32 default_val) {
+       return (SDRAM_WRDTR_LLWP_1_CYC | SDRAM_WRDTR_WTR_0_DEG | 0x823);
+}
+#else
+u32 ddr_wrdtr(u32 default_val) {
+       return (SDRAM_WRDTR_LLWP_1_CYC | SDRAM_WRDTR_WTR_180_DEG_ADV | 0x823);
+}
+
+u32 ddr_clktr(u32 default_val) {
+       return (SDRAM_CLKTR_CLKP_90_DEG_ADV);
+}
+#endif
+
+#if defined(CONFIG_ARCHES)
+/*
+ * FPGA read/write helper macros
+ */
+static inline int board_fpga_read(int offset)
+{
+       int data;
+
+       data = in_8((void *)(CONFIG_SYS_FPGA_BASE + offset));
+
+       return data;
+}
+
+static inline void board_fpga_write(int offset, int data)
+{
+       out_8((void *)(CONFIG_SYS_FPGA_BASE + offset), data);
+}
+
+/*
+ * CPLD read/write helper macros
+ */
+static inline int board_cpld_read(int offset)
+{
+       int data;
+
+       out_8((void *)(CONFIG_SYS_CPLD_ADDR), offset);
+       data = in_8((void *)(CONFIG_SYS_CPLD_DATA));
+
+       return data;
+}
+
+static inline void board_cpld_write(int offset, int data)
+{
+       out_8((void *)(CONFIG_SYS_CPLD_ADDR), offset);
+       out_8((void *)(CONFIG_SYS_CPLD_DATA), data);
+}
+#else
+static int pvr_460ex(void)
+{
+       u32 pvr = get_pvr();
+
+       if ((pvr == PVR_460EX_RA) || (pvr == PVR_460EX_SE_RA) ||
+           (pvr == PVR_460EX_RB))
+               return 1;
+
+       return 0;
+}
+#endif /* defined(CONFIG_ARCHES) */
 
 int board_early_init_f(void)
 {
+#if !defined(CONFIG_ARCHES)
        u32 sdr0_cust0;
-       u32 pvr = get_pvr();
+#endif
 
        /*
         * Setup the interrupt controller polarities, triggers, etc.
         */
-       mtdcr(uic0sr, 0xffffffff);      /* clear all */
-       mtdcr(uic0er, 0x00000000);      /* disable all */
-       mtdcr(uic0cr, 0x00000005);      /* ATI & UIC1 crit are critical */
-       mtdcr(uic0pr, 0xffffffff);      /* per ref-board manual */
-       mtdcr(uic0tr, 0x00000000);      /* per ref-board manual */
-       mtdcr(uic0vr, 0x00000000);      /* int31 highest, base=0x000 */
-       mtdcr(uic0sr, 0xffffffff);      /* clear all */
-
-       mtdcr(uic1sr, 0xffffffff);      /* clear all */
-       mtdcr(uic1er, 0x00000000);      /* disable all */
-       mtdcr(uic1cr, 0x00000000);      /* all non-critical */
-       mtdcr(uic1pr, 0xffffffff);      /* per ref-board manual */
-       mtdcr(uic1tr, 0x00000000);      /* per ref-board manual */
-       mtdcr(uic1vr, 0x00000000);      /* int31 highest, base=0x000 */
-       mtdcr(uic1sr, 0xffffffff);      /* clear all */
-
-       mtdcr(uic2sr, 0xffffffff);      /* clear all */
-       mtdcr(uic2er, 0x00000000);      /* disable all */
-       mtdcr(uic2cr, 0x00000000);      /* all non-critical */
-       mtdcr(uic2pr, 0xffffffff);      /* per ref-board manual */
-       mtdcr(uic2tr, 0x00000000);      /* per ref-board manual */
-       mtdcr(uic2vr, 0x00000000);      /* int31 highest, base=0x000 */
-       mtdcr(uic2sr, 0xffffffff);      /* clear all */
-
-       mtdcr(uic3sr, 0xffffffff);      /* clear all */
-       mtdcr(uic3er, 0x00000000);      /* disable all */
-       mtdcr(uic3cr, 0x00000000);      /* all non-critical */
-       mtdcr(uic3pr, 0xffffffff);      /* per ref-board manual */
-       mtdcr(uic3tr, 0x00000000);      /* per ref-board manual */
-       mtdcr(uic3vr, 0x00000000);      /* int31 highest, base=0x000 */
-       mtdcr(uic3sr, 0xffffffff);      /* clear all */
-
+       mtdcr(UIC0SR, 0xffffffff);      /* clear all */
+       mtdcr(UIC0ER, 0x00000000);      /* disable all */
+       mtdcr(UIC0CR, 0x00000005);      /* ATI & UIC1 crit are critical */
+       mtdcr(UIC0PR, 0xffffffff);      /* per ref-board manual */
+       mtdcr(UIC0TR, 0x00000000);      /* per ref-board manual */
+       mtdcr(UIC0VR, 0x00000000);      /* int31 highest, base=0x000 */
+       mtdcr(UIC0SR, 0xffffffff);      /* clear all */
+
+       mtdcr(UIC1SR, 0xffffffff);      /* clear all */
+       mtdcr(UIC1ER, 0x00000000);      /* disable all */
+       mtdcr(UIC1CR, 0x00000000);      /* all non-critical */
+       mtdcr(UIC1PR, 0xffffffff);      /* per ref-board manual */
+       mtdcr(UIC1TR, 0x00000000);      /* per ref-board manual */
+       mtdcr(UIC1VR, 0x00000000);      /* int31 highest, base=0x000 */
+       mtdcr(UIC1SR, 0xffffffff);      /* clear all */
+
+       mtdcr(UIC2SR, 0xffffffff);      /* clear all */
+       mtdcr(UIC2ER, 0x00000000);      /* disable all */
+       mtdcr(UIC2CR, 0x00000000);      /* all non-critical */
+       mtdcr(UIC2PR, 0xffffffff);      /* per ref-board manual */
+       mtdcr(UIC2TR, 0x00000000);      /* per ref-board manual */
+       mtdcr(UIC2VR, 0x00000000);      /* int31 highest, base=0x000 */
+       mtdcr(UIC2SR, 0xffffffff);      /* clear all */
+
+       mtdcr(UIC3SR, 0xffffffff);      /* clear all */
+       mtdcr(UIC3ER, 0x00000000);      /* disable all */
+       mtdcr(UIC3CR, 0x00000000);      /* all non-critical */
+       mtdcr(UIC3PR, 0xffffffff);      /* per ref-board manual */
+       mtdcr(UIC3TR, 0x00000000);      /* per ref-board manual */
+       mtdcr(UIC3VR, 0x00000000);      /* int31 highest, base=0x000 */
+       mtdcr(UIC3SR, 0xffffffff);      /* clear all */
+
+#if !defined(CONFIG_ARCHES)
        /* SDR Setting - enable NDFC */
        mfsdr(SDR0_CUST0, sdr0_cust0);
        sdr0_cust0 = SDR0_CUST0_MUX_NDFC_SEL    |
@@ -85,8 +157,9 @@ int board_early_init_f(void)
                SDR0_CUST0_NDFC_BW_8_BIT        |
                SDR0_CUST0_NDFC_ARE_MASK        |
                SDR0_CUST0_NDFC_BAC_ENCODE(3)   |
-               (0x80000000 >> (28 + CFG_NAND_CS));
+               (0x80000000 >> (28 + CONFIG_SYS_NAND_CS));
        mtsdr(SDR0_CUST0, sdr0_cust0);
+#endif
 
        /*
         * Configure PFC (Pin Function Control) registers
@@ -97,14 +170,15 @@ int board_early_init_f(void)
        /* Enable PCI host functionality in SDR0_PCI0 */
        mtsdr(SDR0_PCI0, 0xe0000000);
 
+#if !defined(CONFIG_ARCHES)
        /* Enable ethernet and take out of reset */
-       out_8((void *)CFG_BCSR_BASE + 6, 0);
+       out_8((void *)CONFIG_SYS_BCSR_BASE + 6, 0);
 
        /* Remove NOR-FLASH, NAND-FLASH & EEPROM hardware write protection */
-       out_8((void *)CFG_BCSR_BASE + 5, 0);
+       out_8((void *)CONFIG_SYS_BCSR_BASE + 5, 0);
 
        /* Enable USB host & USB-OTG */
-       out_8((void *)CFG_BCSR_BASE + 7, 0);
+       out_8((void *)CONFIG_SYS_BCSR_BASE + 7, 0);
 
        mtsdr(SDR0_SRST1, 0);   /* Pull AHB out of reset default=1 */
 
@@ -112,7 +186,7 @@ int board_early_init_f(void)
        mtdcr(AHB_TOP, 0x8000004B);
        mtdcr(AHB_BOT, 0x8000004B);
 
-       if ((pvr == PVR_460EX_RA) || (pvr == PVR_460EX_SE_RA)) {
+       if (pvr_460ex()) {
                /*
                 * Configure USB-STP pins as alternate and not GPIO
                 * It seems to be neccessary to configure the STP pins as GPIO
@@ -122,10 +196,12 @@ int board_early_init_f(void)
                gpio_config(16, GPIO_OUT, GPIO_ALT1, GPIO_OUT_1);
                gpio_config(19, GPIO_OUT, GPIO_ALT1, GPIO_OUT_1);
        }
+#endif
 
        return 0;
 }
 
+#if !defined(CONFIG_ARCHES)
 static void canyonlands_sata_init(int board_type)
 {
        u32 reg;
@@ -146,21 +222,39 @@ static void canyonlands_sata_init(int board_type)
                SDR_WRITE(SDR0_SRST1, 0x00000000);
        }
 }
+#endif /* !defined(CONFIG_ARCHES) */
+
+int get_cpu_num(void)
+{
+       int cpu = NA_OR_UNKNOWN_CPU;
+
+#if defined(CONFIG_ARCHES)
+       int cpu_num;
+
+       cpu_num = board_fpga_read(0x3);
+
+       /* sanity check; assume cpu numbering starts and increments from 0 */
+       if ((cpu_num >= 0) && (cpu_num < CONFIG_BD_NUM_CPUS))
+               cpu = cpu_num;
+#endif
 
+       return cpu;
+}
+
+#if !defined(CONFIG_ARCHES)
 int checkboard(void)
 {
        char *s = getenv("serial#");
-       u32 pvr = get_pvr();
 
-       if ((pvr == PVR_460GT_RA) || (pvr == PVR_460GT_SE_RA)) {
-               printf("Board: Glacier - AMCC PPC460GT Evaluation Board");
-               gd->board_type = BOARD_GLACIER;
-       } else {
+       if (pvr_460ex()) {
                printf("Board: Canyonlands - AMCC PPC460EX Evaluation Board");
-               if (in_8((void *)(CFG_BCSR_BASE + 3)) & CFG_BCSR3_PCIE)
+               if (in_8((void *)(CONFIG_SYS_BCSR_BASE + 3)) & CONFIG_SYS_BCSR3_PCIE)
                        gd->board_type = BOARD_CANYONLANDS_PCIE;
                else
                        gd->board_type = BOARD_CANYONLANDS_SATA;
+       } else {
+               printf("Board: Glacier - AMCC PPC460GT Evaluation Board");
+               gd->board_type = BOARD_GLACIER;
        }
 
        switch (gd->board_type) {
@@ -174,7 +268,7 @@ int checkboard(void)
                break;
        }
 
-       printf(", Rev. %X", in_8((void *)(CFG_BCSR_BASE + 0)));
+       printf(", Rev. %X", in_8((void *)(CONFIG_SYS_BCSR_BASE + 0)));
 
        if (s != NULL) {
                puts(", serial# ");
@@ -187,17 +281,38 @@ int checkboard(void)
        return (0);
 }
 
-/*
- * Override the default functions in cpu/ppc4xx/44x_spd_ddr2.c with
- * board specific values.
- */
-u32 ddr_wrdtr(u32 default_val) {
-       return (SDRAM_WRDTR_LLWP_1_CYC | SDRAM_WRDTR_WTR_180_DEG_ADV | 0x823);
-}
+#else  /* defined(CONFIG_ARCHES) */
 
-u32 ddr_clktr(u32 default_val) {
-       return (SDRAM_CLKTR_CLKP_90_DEG_ADV);
+int checkboard(void)
+{
+       char *s = getenv("serial#");
+
+       printf("Board: Arches - AMCC DUAL PPC460GT Reference Design\n");
+       printf("       Revision %02x.%02x ",
+                               board_fpga_read(0x0), board_fpga_read(0x1));
+
+       gd->board_type = BOARD_ARCHES;
+
+       /* Only CPU0 has access to CPLD registers */
+       if (get_cpu_num() == 0) {
+               u8 cfg_sw = board_cpld_read(0x1);
+               printf("(FPGA=%02x, CPLD=%02x)\n",
+                               board_fpga_read(0x2), board_cpld_read(0x0));
+               printf("       Configuration Switch %d%d%d%d\n",
+                               ((cfg_sw >> 3) & 0x01),
+                               ((cfg_sw >> 2) & 0x01),
+                               ((cfg_sw >> 1) & 0x01),
+                               ((cfg_sw >> 0) & 0x01));
+       } else
+               printf("(FPGA=%02x, CPLD=xx)\n", board_fpga_read(0x2));
+
+
+       if (s != NULL)
+               printf("       Serial# %s\n", s);
+
+       return 0;
 }
+#endif /* !defined(CONFIG_ARCHES) */
 
 #if defined(CONFIG_NAND_U_BOOT)
 /*
@@ -205,145 +320,23 @@ u32 ddr_clktr(u32 default_val) {
  * I2C SPD DIMM autodetection/calibration doesn't fit into the 4k of boot
  * code.
  */
-long int initdram(int board_type)
+phys_size_t initdram(int board_type)
 {
-       return CFG_MBYTES_SDRAM << 20;
+       return CONFIG_SYS_MBYTES_SDRAM << 20;
 }
 #endif
 
-/*
- *  pci_target_init
- *
- *     The bootstrap configuration provides default settings for the pci
- *     inbound map (PIM). But the bootstrap config choices are limited and
- *     may not be sufficient for a given board.
- */
-#if defined(CONFIG_PCI) && defined(CFG_PCI_TARGET_INIT)
-void pci_target_init(struct pci_controller * hose )
-{
-       /*
-        * Disable everything
-        */
-       out_le32((void *)PCIX0_PIM0SA, 0); /* disable */
-       out_le32((void *)PCIX0_PIM1SA, 0); /* disable */
-       out_le32((void *)PCIX0_PIM2SA, 0); /* disable */
-       out_le32((void *)PCIX0_EROMBA, 0); /* disable expansion rom */
-
-       /*
-        * Map all of SDRAM to PCI address 0x0000_0000. Note that the 440
-        * strapping options to not support sizes such as 128/256 MB.
-        */
-       out_le32((void *)PCIX0_PIM0LAL, CFG_SDRAM_BASE);
-       out_le32((void *)PCIX0_PIM0LAH, 0);
-       out_le32((void *)PCIX0_PIM0SA, ~(gd->ram_size - 1) | 1);
-       out_le32((void *)PCIX0_BAR0, 0);
-
-       /*
-        * Program the board's subsystem id/vendor id
-        */
-       out_le16((void *)PCIX0_SBSYSVID, CFG_PCI_SUBSYS_VENDORID);
-       out_le16((void *)PCIX0_SBSYSID, CFG_PCI_SUBSYS_DEVICEID);
-
-       out_le16((void *)PCIX0_CMD, in16r(PCIX0_CMD) | PCI_COMMAND_MEMORY);
-}
-#endif /* defined(CONFIG_PCI) && defined(CFG_PCI_TARGET_INIT) */
-
 #if defined(CONFIG_PCI)
-/*
- * is_pci_host
- *
- * This routine is called to determine if a pci scan should be
- * performed. With various hardware environments (especially cPCI and
- * PPMC) it's insufficient to depend on the state of the arbiter enable
- * bit in the strap register, or generic host/adapter assumptions.
- *
- * Rather than hard-code a bad assumption in the general 440 code, the
- * 440 pci code requires the board to decide at runtime.
- *
- * Return 0 for adapter mode, non-zero for host (monarch) mode.
- */
-int is_pci_host(struct pci_controller *hose)
-{
-       /* Board is always configured as host. */
-       return (1);
-}
-
-static struct pci_controller pcie_hose[2] = {{0},{0}};
-
-void pcie_setup_hoses(int busno)
+int board_pcie_first(void)
 {
-       struct pci_controller *hose;
-       int i, bus;
-       int ret = 0;
-       char *env;
-       unsigned int delay;
-       int start;
-
-       /*
-        * assume we're called after the PCIX hose is initialized, which takes
-        * bus ID 0 and therefore start numbering PCIe's from 1.
-        */
-       bus = busno;
-
        /*
         * Canyonlands with SATA enabled has only one PCIe slot
         * (2nd one).
         */
        if (gd->board_type == BOARD_CANYONLANDS_SATA)
-               start = 1;
-       else
-               start = 0;
-
-       for (i = start; i <= 1; i++) {
+               return 1;
 
-               if (is_end_point(i))
-                       ret = ppc4xx_init_pcie_endport(i);
-               else
-                       ret = ppc4xx_init_pcie_rootport(i);
-               if (ret) {
-                       printf("PCIE%d: initialization as %s failed\n", i,
-                              is_end_point(i) ? "endpoint" : "root-complex");
-                       continue;
-               }
-
-               hose = &pcie_hose[i];
-               hose->first_busno = bus;
-               hose->last_busno = bus;
-               hose->current_busno = bus;
-
-               /* setup mem resource */
-               pci_set_region(hose->regions + 0,
-                              CFG_PCIE_MEMBASE + i * CFG_PCIE_MEMSIZE,
-                              CFG_PCIE_MEMBASE + i * CFG_PCIE_MEMSIZE,
-                              CFG_PCIE_MEMSIZE,
-                              PCI_REGION_MEM);
-               hose->region_count = 1;
-               pci_register_hose(hose);
-
-               if (is_end_point(i)) {
-                       ppc4xx_setup_pcie_endpoint(hose, i);
-                       /*
-                        * Reson for no scanning is endpoint can not generate
-                        * upstream configuration accesses.
-                        */
-               } else {
-                       ppc4xx_setup_pcie_rootpoint(hose, i);
-                       env = getenv ("pciscandelay");
-                       if (env != NULL) {
-                               delay = simple_strtoul(env, NULL, 10);
-                               if (delay > 5)
-                                       printf("Warning, expect noticable delay before "
-                                              "PCIe scan due to 'pciscandelay' value!\n");
-                               mdelay(delay * 1000);
-                       }
-
-                       /*
-                        * Config access can only go down stream
-                        */
-                       hose->last_busno = pci_hose_scan(hose);
-                       bus = hose->last_busno + 1;
-               }
-       }
+       return 0;
 }
 #endif /* CONFIG_PCI */
 
@@ -361,16 +354,16 @@ int board_early_init_r (void)
 
        /* Remap the NOR FLASH to 0xcc00.0000 ... 0xcfff.ffff */
 #if defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL)
-       mtebc(pb3cr, CFG_FLASH_BASE_PHYS_L | 0xda000);
+       mtebc(PB3CR, CONFIG_SYS_FLASH_BASE_PHYS_L | 0xda000);
 #else
-       mtebc(pb0cr, CFG_FLASH_BASE_PHYS_L | 0xda000);
+       mtebc(PB0CR, CONFIG_SYS_FLASH_BASE_PHYS_L | 0xda000);
 #endif
 
        /* Remove TLB entry of boot EBC mapping */
-       remove_tlb(CFG_BOOT_BASE_ADDR, 16 << 20);
+       remove_tlb(CONFIG_SYS_BOOT_BASE_ADDR, 16 << 20);
 
        /* Add TLB entry for 0xfc00.0000 -> 0x4.cc00.0000 */
-       program_tlb(CFG_FLASH_BASE_PHYS, CFG_FLASH_BASE, CFG_FLASH_SIZE,
+       program_tlb(CONFIG_SYS_FLASH_BASE_PHYS, CONFIG_SYS_FLASH_BASE, CONFIG_SYS_FLASH_SIZE,
                    TLB_WORD2_I_ENABLE);
 
        /*
@@ -388,11 +381,12 @@ int board_early_init_r (void)
        return 0;
 }
 
+#if !defined(CONFIG_ARCHES)
 int misc_init_r(void)
 {
        u32 sdr0_srst1 = 0;
        u32 eth_cfg;
-       u32 pvr = get_pvr();
+       u8 val;
 
        /*
         * Set EMAC mode/configuration (GMII, SGMII, RGMII...).
@@ -406,7 +400,7 @@ int misc_init_r(void)
        /* Set the for 2 RGMII mode */
        /* GMC0 EMAC4_0, GMC0 EMAC4_1, RGMII Bridge 0 */
        eth_cfg &= ~SDR0_ETH_CFG_GMC0_BRIDGE_SEL;
-       if ((pvr == PVR_460EX_RA) || (pvr == PVR_460EX_SE_RA))
+       if (pvr_460ex())
                eth_cfg |= SDR0_ETH_CFG_GMC1_BRIDGE_SEL;
        else
                eth_cfg &= ~SDR0_ETH_CFG_GMC1_BRIDGE_SEL;
@@ -420,28 +414,65 @@ int misc_init_r(void)
        sdr0_srst1 &= ~SDR0_SRST1_AHB;
        mtsdr(SDR0_SRST1, sdr0_srst1);
 
+       /*
+        * RTC/M41T62:
+        * Disable square wave output: Batterie will be drained
+        * quickly, when this output is not disabled
+        */
+       val = i2c_reg_read(CONFIG_SYS_I2C_RTC_ADDR, 0xa);
+       val &= ~0x40;
+       i2c_reg_write(CONFIG_SYS_I2C_RTC_ADDR, 0xa, val);
+
+       return 0;
+}
+
+#else  /* defined(CONFIG_ARCHES) */
+
+int misc_init_r(void)
+{
+       u32 eth_cfg = 0;
+       u32 eth_pll;
+       u32 reg;
+
+       /*
+        * Set EMAC mode/configuration (GMII, SGMII, RGMII...).
+        * This is board specific, so let's do it here.
+        */
+
+       /* enable SGMII mode */
+       eth_cfg |= (SDR0_ETH_CFG_SGMII0_ENABLE |
+                       SDR0_ETH_CFG_SGMII1_ENABLE |
+                       SDR0_ETH_CFG_SGMII2_ENABLE);
+
+       /* Set EMAC for MDIO */
+       eth_cfg |= SDR0_ETH_CFG_MDIO_SEL_EMAC0;
+
+       /* bypass the TAHOE0/TAHOE1 cores for U-Boot */
+       eth_cfg |= (SDR0_ETH_CFG_TAHOE0_BYPASS | SDR0_ETH_CFG_TAHOE1_BYPASS);
+
+       mtsdr(SDR0_ETH_CFG, eth_cfg);
+
+       /* reset all SGMII interfaces */
+       mfsdr(SDR0_SRST1,   reg);
+       reg |= (SDR0_SRST1_SGMII0 | SDR0_SRST1_SGMII1 | SDR0_SRST1_SGMII2);
+       mtsdr(SDR0_SRST1, reg);
+       mtsdr(SDR0_ETH_STS, 0xFFFFFFFF);
+       mtsdr(SDR0_SRST1,   0x00000000);
+
+       do {
+               mfsdr(SDR0_ETH_PLL, eth_pll);
+       } while (!(eth_pll & SDR0_ETH_PLL_PLLLOCK));
+
        return 0;
 }
+#endif /* !defined(CONFIG_ARCHES) */
 
 #if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
+extern void __ft_board_setup(void *blob, bd_t *bd);
+
 void ft_board_setup(void *blob, bd_t *bd)
 {
-       u32 val[4];
-       int rc;
-
-       ft_cpu_setup(blob, bd);
-
-       /* Fixup NOR mapping */
-       val[0] = 0;                             /* chip select number */
-       val[1] = 0;                             /* always 0 */
-       val[2] = CFG_FLASH_BASE_PHYS_L;         /* we fixed up this address */
-       val[3] = gd->bd->bi_flashsize;
-       rc = fdt_find_and_setprop(blob, "/plb/opb/ebc", "ranges",
-                                 val, sizeof(val), 1);
-       if (rc) {
-               printf("Unable to update property NOR mapping, err=%s\n",
-                      fdt_strerror(rc));
-       }
+       __ft_board_setup(blob, bd);
 
        if (gd->board_type == BOARD_CANYONLANDS_SATA) {
                /*
@@ -449,12 +480,8 @@ void ft_board_setup(void *blob, bd_t *bd)
                 * node in the device tree, so that Linux doesn't initialize
                 * it.
                 */
-               rc = fdt_find_and_setprop(blob, "/plb/pciex@d00000000", "status",
-                                         "disabled", sizeof("disabled"), 1);
-               if (rc) {
-                       printf("Unable to update property status in PCIe node, err=%s\n",
-                              fdt_strerror(rc));
-               }
+               fdt_find_and_setprop(blob, "/plb/pciex@d00000000", "status",
+                                    "disabled", sizeof("disabled"), 1);
        }
 
        if (gd->board_type == BOARD_CANYONLANDS_PCIE) {
@@ -463,12 +490,8 @@ void ft_board_setup(void *blob, bd_t *bd)
                 * node in the device tree, so that Linux doesn't initialize
                 * it.
                 */
-               rc = fdt_find_and_setprop(blob, "/plb/sata@bffd1000", "status",
-                                         "disabled", sizeof("disabled"), 1);
-               if (rc) {
-                       printf("Unable to update property status in PCIe node, err=%s\n",
-                              fdt_strerror(rc));
-               }
+               fdt_find_and_setprop(blob, "/plb/sata@bffd1000", "status",
+                                    "disabled", sizeof("disabled"), 1);
        }
 }
 #endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */