Merge branch 'master' of git://git.denx.de/u-boot-fdt

[u-boot] / board / earthlcd / favr-32-ezkit / flash.c

diff --git a/board/earthlcd/favr-32-ezkit/flash.c b/board/earthlcd/favr-32-ezkit/flash.c
index 2aa9415e8f5642a7f0ecea4903566bf6a0db1887..e45c6f4d01f579f5ed58f4e80203f687ca2415d1 100644 (file)
--- a/board/earthlcd/favr-32-ezkit/flash.c
+++ b/board/earthlcd/favr-32-ezkit/flash.c
@@ -1,26 +1,12 @@
 /*
  * Copyright (C) 2008 Atmel Corporation
  *
- * 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>
 
 #ifdef CONFIG_FAVR32_EZKIT_EXT_FLASH
-#include <asm/cacheflush.h>
+#include <asm/arch/cacheflush.h>
 #include <asm/io.h>
 #include <asm/sections.h>
 
@@ -53,17 +39,17 @@ unsigned long flash_init(void)
        unsigned long addr;
        unsigned int i;
 
-       flash_info[0].size = CFG_FLASH_SIZE;
+       flash_info[0].size = CONFIG_SYS_FLASH_SIZE;
        flash_info[0].sector_count = 135;
 
-       flash_identify(uncached((void *)CFG_FLASH_BASE), &flash_info[0]);
+       flash_identify(uncached((void *)CONFIG_SYS_FLASH_BASE), &flash_info[0]);
 
        for (i = 0, addr = 0; i < 8; i++, addr += 0x2000)
                flash_info[0].start[i] = addr;
        for (; i < flash_info[0].sector_count; i++, addr += 0x10000)
                flash_info[0].start[i] = addr;
 
-       return CFG_FLASH_SIZE;
+       return CONFIG_SYS_FLASH_SIZE;
 }
 
 void flash_print_info(flash_info_t *info)