Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx

[u-boot] / board / snmc / qs860t / flash.c

diff --git a/board/snmc/qs860t/flash.c b/board/snmc/qs860t/flash.c
index 2cb8dcb9d803ddad27b15549ac05957f18e883a5..c24d9792de331a0451a5d9f21bf66b6b2e0df655 100644 (file)
--- a/board/snmc/qs860t/flash.c
+++ b/board/snmc/qs860t/flash.c
@@ -5,27 +5,11 @@
  * (C) Copyright 2001
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
  *
- * 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/u-boot.h>
 #include <asm/processor.h>
 
@@ -102,21 +86,21 @@ 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);
+                       mtdcr(EBC0_CFGDATA, 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);
+                       mtdcr(EBC0_CFGDATA, pbcr);
                }
 
                size_b0 = flash_get_size((volatile FLASH_WORD_SIZE *)base_b0, &flash_info[0]);