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

[u-boot] / board / prodrive / pdnb3 / flash.c

diff --git a/board/prodrive/pdnb3/flash.c b/board/prodrive/pdnb3/flash.c
index d0e5fe703b98fd386fed671abc7d5d780dfb156c..75b5d0544a6e9db140abce9140264a5a1929d744 100644 (file)
--- a/board/prodrive/pdnb3/flash.c
+++ b/board/prodrive/pdnb3/flash.c
@@ -2,28 +2,14 @@
  * (C) Copyright 2006
  * Stefan Roese, DENX Software Engineering, sr@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 <asm/arch/ixp425.h>
 
+#if !defined(CONFIG_FLASH_CFI_DRIVER)
+
 /*
  * include common flash code (for esd boards)
  */
@@ -50,7 +36,7 @@ unsigned long flash_init(void)
        int i;
 
        /* 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;
 
        size = flash_get_size((vu_long *)FLASH_BASE0_PRELIM, &flash_info[0]);
@@ -64,22 +50,24 @@ unsigned long flash_init(void)
 
        /* Monitor protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
-                     CFG_MONITOR_BASE, CFG_MONITOR_BASE + monitor_flash_len - 1,
-                     &flash_info[CFG_MAX_FLASH_BANKS - 1]);
+                     CONFIG_SYS_MONITOR_BASE, CONFIG_SYS_MONITOR_BASE + monitor_flash_len - 1,
+                     &flash_info[CONFIG_SYS_MAX_FLASH_BANKS - 1]);
 
        /* Environment protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
-                     CFG_ENV_ADDR,
-                     CFG_ENV_ADDR + CFG_ENV_SECT_SIZE - 1,
-                     &flash_info[CFG_MAX_FLASH_BANKS - 1]);
+                     CONFIG_ENV_ADDR,
+                     CONFIG_ENV_ADDR + CONFIG_ENV_SECT_SIZE - 1,
+                     &flash_info[CONFIG_SYS_MAX_FLASH_BANKS - 1]);
 
        /* Redundant environment protection ON by default */
        flash_protect(FLAG_PROTECT_SET,
-                     CFG_ENV_ADDR_REDUND,
-                     CFG_ENV_ADDR_REDUND + CFG_ENV_SIZE_REDUND - 1,
-                     &flash_info[CFG_MAX_FLASH_BANKS - 1]);
+                     CONFIG_ENV_ADDR_REDUND,
+                     CONFIG_ENV_ADDR_REDUND + CONFIG_ENV_SECT_SIZE - 1,
+                     &flash_info[CONFIG_SYS_MAX_FLASH_BANKS - 1]);
 
        flash_info[0].size = size;
 
        return size;
 }
+
+#endif /* CONFIG_FLASH_CFI_DRIVER */