ppc4xx: Move ppc4xx headers to powerpc include directory

[u-boot] / board / amcc / bubinga / flash.c

diff --git a/board/amcc/bubinga/flash.c b/board/amcc/bubinga/flash.c
index d71cc292e93d040497db948e31dd05ed489394ca..4850fe12196dabeedd7996df79e7cde9a356e6ca 100644 (file)
--- a/board/amcc/bubinga/flash.c
+++ b/board/amcc/bubinga/flash.c
@@ -29,10 +29,10 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
-flash_info_t flash_info[CFG_MAX_FLASH_BANKS];  /* info for FLASH chips        */
+flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];   /* info for FLASH chips        */
 
 #undef DEBUG
 #ifdef DEBUG
@@ -60,7 +60,7 @@ unsigned long flash_init(void)
        unsigned long base_b0, base_b1;
 
        /* Init: no FLASHes known */
-       for (i = 0; i < CFG_MAX_FLASH_BANKS; ++i) {
+       for (i = 0; i < CONFIG_SYS_MAX_FLASH_BANKS; ++i) {
                flash_info[i].flash_id = FLASH_UNKNOWN;
        }
 
@@ -75,14 +75,14 @@ unsigned long flash_init(void)
        }
 
        /* Only one bank */
-       if (CFG_MAX_FLASH_BANKS == 1) {
+       if (CONFIG_SYS_MAX_FLASH_BANKS == 1) {
                /* Setup offsets */
                flash_get_offsets(FLASH_BASE0_PRELIM, &flash_info[0]);
 
                /* Monitor protection ON by default */
                (void)flash_protect(FLAG_PROTECT_SET,
-                                   CFG_MONITOR_BASE,
-                                   CFG_MONITOR_BASE + CFG_MONITOR_LEN - 1,
+                                   CONFIG_SYS_MONITOR_BASE,
+                                   CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN - 1,
                                    &flash_info[0]);
 #ifdef CONFIG_ENV_IS_IN_FLASH
                (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
@@ -106,25 +106,25 @@ unsigned long flash_init(void)
                /* Re-do sizing to get full correct info */
 
                if (size_b1) {
-                       mtdcr(ebccfga, pb0cr);
-                       pbcr = mfdcr(ebccfgd);
-                       mtdcr(ebccfga, pb0cr);
+                       mtdcr(EBC0_CFGADDR, PB0CR);
+                       pbcr = mfdcr(EBC0_CFGDATA);
+                       mtdcr(EBC0_CFGADDR, PB0CR);
                        base_b1 = -size_b1;
                        pbcr = (pbcr & 0x0001ffff) | base_b1 |
                            (((size_b1 / 1024 / 1024) - 1) << 17);
-                       mtdcr(ebccfgd, pbcr);
-                       /*          printf("pb1cr = %x\n", pbcr); */
+                       mtdcr(EBC0_CFGDATA, pbcr);
+                       /*          printf("PB1CR = %x\n", pbcr); */
                }
 
                if (size_b0) {
-                       mtdcr(ebccfga, pb1cr);
-                       pbcr = mfdcr(ebccfgd);
-                       mtdcr(ebccfga, pb1cr);
+                       mtdcr(EBC0_CFGADDR, PB1CR);
+                       pbcr = mfdcr(EBC0_CFGDATA);
+                       mtdcr(EBC0_CFGADDR, PB1CR);
                        base_b0 = base_b1 - size_b0;
                        pbcr = (pbcr & 0x0001ffff) | base_b0 |
                            (((size_b0 / 1024 / 1024) - 1) << 17);
-                       mtdcr(ebccfgd, pbcr);
-                       /*            printf("pb0cr = %x\n", pbcr); */
+                       mtdcr(EBC0_CFGDATA, pbcr);
+                       /*            printf("PB0CR = %x\n", pbcr); */
                }
 
                size_b0 = flash_get_size((vu_long *) base_b0, &flash_info[0]);
@@ -133,7 +133,7 @@ unsigned long flash_init(void)
 
                /* monitor protection ON by default */
                (void)flash_protect(FLAG_PROTECT_SET,
-                                   base_b0 + size_b0 - CFG_MONITOR_LEN,
+                                   base_b0 + size_b0 - CONFIG_SYS_MONITOR_LEN,
                                    base_b0 + size_b0 - 1, &flash_info[0]);
                /* Also protect sector containing initial power-up instruction */
                /* (flash_protect() checks address range - other call ignored) */
@@ -151,12 +151,12 @@ unsigned long flash_init(void)
 
                        /* monitor protection ON by default */
                        (void)flash_protect(FLAG_PROTECT_SET,
-                                           base_b1 + size_b1 - CFG_MONITOR_LEN,
+                                           base_b1 + size_b1 - CONFIG_SYS_MONITOR_LEN,
                                            base_b1 + size_b1 - 1,
                                            &flash_info[1]);
                        /* monitor protection OFF by default (one is enough) */
                        (void)flash_protect(FLAG_PROTECT_CLEAR,
-                                           base_b0 + size_b0 - CFG_MONITOR_LEN,
+                                           base_b0 + size_b0 - CONFIG_SYS_MONITOR_LEN,
                                            base_b0 + size_b0 - 1,
                                            &flash_info[0]);
                } else {