mpc8308_p1m: support for MPC8308 P1M board

[u-boot] / board / tb0229 / flash.c

diff --git a/board/tb0229/flash.c b/board/tb0229/flash.c
index 933d5ecc87e51db16e44e75a5ae9157415651e8d..75d7769b60a30754b33252991a8321bc4832807d 100644 (file)
--- a/board/tb0229/flash.c
+++ b/board/tb0229/flash.c
@@ -24,7 +24,7 @@
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 flash_info_t flash_info[CONFIG_SYS_MAX_FLASH_BANKS];   /* info for FLASH chips        */
@@ -108,25 +108,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 =