ppc4xx: Move ppc4xx headers to powerpc include directory

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

diff --git a/board/amcc/walnut/flash.c b/board/amcc/walnut/flash.c
index 056f9b9362a64dd504bfb78cc7ac5d95db8e5b6f..f72e278b4f58d126b361d8caf98678d66b9c119f 100644 (file)
--- a/board/amcc/walnut/flash.c
+++ b/board/amcc/walnut/flash.c
@@ -29,7 +29,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 #undef DEBUG
@@ -58,7 +58,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;
        }
 
@@ -73,21 +73,21 @@ 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 CFG_ENV_IS_IN_FLASH
-               (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR,
-                                   CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
+#ifdef CONFIG_ENV_IS_IN_FLASH
+               (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR,
+                                   CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
                                    &flash_info[0]);
-               (void)flash_protect(FLAG_PROTECT_SET, CFG_ENV_ADDR_REDUND,
-                                   CFG_ENV_ADDR_REDUND + CFG_ENV_SECT_SIZE - 1,
+               (void)flash_protect(FLAG_PROTECT_SET, CONFIG_ENV_ADDR_REDUND,
+                                   CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,
                                    &flash_info[0]);
 #endif
 
@@ -102,27 +102,27 @@ 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]);