ppc4xx: Big cleanup of PPC4xx defines

[oweals/u-boot.git] / board / amcc / bubinga / bubinga.c

diff --git a/board/amcc/bubinga/bubinga.c b/board/amcc/bubinga/bubinga.c
index 9d508b8937e0f005ab06c832203a195741a5a337..d0aebec2cd49e7ecc666009727d9a7eecc9c3973 100644 (file)
--- a/board/amcc/bubinga/bubinga.c
+++ b/board/amcc/bubinga/bubinga.c
@@ -41,9 +41,9 @@ int board_early_init_f(void)
         * and enable the internal PCI arbiter if selected
         */
        if (in_8((void *)FPGA_REG1) & FPGA_REG1_PCI_INT_ARB)
-               mtdcr(cpc0_pci, CPC0_PCI_HOST_CFG_EN | CPC0_PCI_ARBIT_EN);
+               mtdcr(CPC0_PCI, CPC0_PCI_HOST_CFG_EN | CPC0_PCI_ARBIT_EN);
        else
-               mtdcr(cpc0_pci, CPC0_PCI_HOST_CFG_EN);
+               mtdcr(CPC0_PCI, CPC0_PCI_HOST_CFG_EN);
 
        return 0;
 }
@@ -70,7 +70,7 @@ int checkboard(void)
   initdram(int board_type) reads EEPROM via I2c. EEPROM contains all of
   the necessary info for SDRAM controller configuration
    ------------------------------------------------------------------------- */
-long int initdram(int board_type)
+phys_size_t initdram(int board_type)
 {
        long int ret;