powerpc/85xx: add support for the Freescale P5040DS Superhydra reference board

[u-boot] / board / freescale / mpc8360erdk / mpc8360erdk.c

diff --git a/board/freescale/mpc8360erdk/mpc8360erdk.c b/board/freescale/mpc8360erdk/mpc8360erdk.c
index af3b8ceae4e65b2bcc6a15e1e961d1b9d93837bb..99c0fbb9dd6bef24e4cfdf8b92814372fc615a30 100644 (file)
--- a/board/freescale/mpc8360erdk/mpc8360erdk.c
+++ b/board/freescale/mpc8360erdk/mpc8360erdk.c
@@ -207,11 +207,6 @@ const qe_iop_conf_t qe_iop_conf_tab[] = {
        {0,  0, 0, 0, QE_IOP_TAB_END},
 };
 
-int board_early_init_f(void)
-{
-       return 0;
-}
-
 int board_early_init_r(void)
 {
        void *reg = (void *)(CONFIG_SYS_IMMR + 0x14a8);
@@ -268,7 +263,7 @@ int fixed_sdram(void)
 
 phys_size_t initdram(int board_type)
 {
-#if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRC)
+#if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER)
        extern void ddr_enable_ecc(unsigned int dram_size);
 #endif
        volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
@@ -281,7 +276,7 @@ phys_size_t initdram(int board_type)
        im->sysconf.ddrlaw[0].bar = CONFIG_SYS_DDR_BASE & LAWBAR_BAR;
        msize = fixed_sdram();
 
-#if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRC)
+#if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER)
        /*
         * Initialize DDR ECC byte
         */
@@ -326,7 +321,7 @@ void pci_init_board(void)
        volatile law83xx_t *pci_law = immr->sysconf.pcilaw;
        struct pci_region *reg[] = { pci_regions, };
 
-#if defined(PCI_33M)
+#if defined(CONFIG_PCI_33M)
        clk->occr = OCCR_PCICOE0 | OCCR_PCICOE1 | OCCR_PCICOE2 |
                    OCCR_PCICD0 | OCCR_PCICD1 | OCCR_PCICD2 | OCCR_PCICR;
        printf("PCI clock is 33MHz\n");
@@ -344,7 +339,7 @@ void pci_init_board(void)
        pci_law[1].bar = CONFIG_SYS_PCI1_IO_PHYS & LAWBAR_BAR;
        pci_law[1].ar = LBLAWAR_EN | LBLAWAR_1MB;
 
-       mpc83xx_pci_init(1, reg, 0);
+       mpc83xx_pci_init(1, reg);
 }
 
 #if defined(CONFIG_OF_BOARD_SETUP)