rename CFG_ macros to CONFIG_SYS

[karo-tx-uboot.git] / board / amcc / makalu / makalu.c

diff --git a/board/amcc/makalu/makalu.c b/board/amcc/makalu/makalu.c
index 15e51f42925b68de20cc9e823c11a09b639feada..9fc0ec6667ef282a25e53d3b59c4e91e544abdfa 100644 (file)
--- a/board/amcc/makalu/makalu.c
+++ b/board/amcc/makalu/makalu.c
@@ -28,6 +28,7 @@
 #include <asm/processor.h>
 #include <asm/gpio.h>
 #include <asm/io.h>
+#include <fdt_support.h>
 
 #if defined(CONFIG_PCI)
 #include <pci.h>
@@ -36,7 +37,7 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
-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    */
 
 /*
  * Board early initialization function
@@ -193,9 +194,9 @@ int board_early_init_f (void)
        mtsdr(SDR0_SRST, 0);
 
        /* Reset PCIe slots */
-       gpio_write_bit(CFG_GPIO_PCIE_RST, 0);
+       gpio_write_bit(CONFIG_SYS_GPIO_PCIE_RST, 0);
        udelay(100);
-       gpio_write_bit(CFG_GPIO_PCIE_RST, 1);
+       gpio_write_bit(CONFIG_SYS_GPIO_PCIE_RST, 1);
 
        /*
         * Configure PFC (Pin Function Control) registers
@@ -209,10 +210,10 @@ int board_early_init_f (void)
 
 int misc_init_r(void)
 {
-#ifdef CFG_ENV_IS_IN_FLASH
+#ifdef CONFIG_ENV_IS_IN_FLASH
        /* Monitor protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
-                     -CFG_MONITOR_LEN,
+                     -CONFIG_SYS_MONITOR_LEN,
                      0xffffffff,
                      &flash_info[0]);
 #endif
@@ -285,35 +286,35 @@ void pcie_setup_hoses(int busno)
 
                /* 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,
+                              CONFIG_SYS_PCIE_MEMBASE + i * CONFIG_SYS_PCIE_MEMSIZE,
+                              CONFIG_SYS_PCIE_MEMBASE + i * CONFIG_SYS_PCIE_MEMSIZE,
+                              CONFIG_SYS_PCIE_MEMSIZE,
                               PCI_REGION_MEM);
                hose->region_count = 1;
                pci_register_hose(hose);
 
                if (is_end_point(i)) {
-                       ppc4xx_setup_pcie_endpoint(hose, 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);
+                       ppc4xx_setup_pcie_rootpoint(hose, i);
                        env = getenv ("pciscandelay");
-                       if (env != NULL) {
-                               delay = simple_strtoul(env, NULL, 10);
+                       if (env != NULL) {
+                               delay = simple_strtoul(env, NULL, 10);
                                if (delay > 5)
-                                       printf("Warning, expect noticable delay before "
+                                       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;
+                       /*
+                        * Config access can only go down stream
+                        */
+                       hose->last_busno = pci_hose_scan(hose);
+                       bus = hose->last_busno + 1;
                }
        }
 }
@@ -329,24 +330,3 @@ int post_hotkeys_pressed(void)
        return 0;       /* No hotkeys supported */
 }
 #endif /* CONFIG_POST */
-
-#if defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP)
-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] = gd->bd->bi_flashstart;
-       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));
-}
-#endif /* defined(CONFIG_OF_LIBFDT) && defined(CONFIG_OF_BOARD_SETUP) */