arm: rmobile: koelsch: Update QoS initialization to version 0.334

[oweals/u-boot.git] / board / esd / ocrtc / flash.c

diff --git a/board/esd/ocrtc/flash.c b/board/esd/ocrtc/flash.c
index e763a895ea4d37ebc3134a4ff7affc29cc937a67..279746e57b019f2d120eafe8e1af1f95871440ab 100644 (file)
--- a/board/esd/ocrtc/flash.c
+++ b/board/esd/ocrtc/flash.c
@@ -2,27 +2,11 @@
  * (C) Copyright 2001
  * Stefan Roese, esd gmbh germany, stefan.roese@esd-electronics.com
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
-#include <ppc4xx.h>
+#include <asm/ppc4xx.h>
 #include <asm/processor.h>
 
 /*
@@ -68,9 +52,9 @@ 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;
                switch (size_b1) {
                case 1 << 20:
@@ -90,14 +74,14 @@ unsigned long flash_init (void)
                        break;
                }
                pbcr = (pbcr & 0x0001ffff) | base_b1 | (size_val << 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;
                switch (size_b1) {
                case 1 << 20:
@@ -117,8 +101,8 @@ unsigned long flash_init (void)
                        break;
                }
                pbcr = (pbcr & 0x0001ffff) | base_b0 | (size_val << 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]);