Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / board / cogent / flash.c

diff --git a/board/cogent/flash.c b/board/cogent/flash.c
index ec3f94d2d5f9a211c650df45cb4fb2022e5f339d..1da8f10a1f955b370851f49eabd4151d45fec489 100644 (file)
--- a/board/cogent/flash.c
+++ b/board/cogent/flash.c
@@ -2,27 +2,11 @@
  * (C) Copyright 2000
  * 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 <board/cogent/flash.h>
+#include "flash.h"
 #include <linux/compiler.h>
 
 flash_info_t   flash_info[CONFIG_SYS_MAX_FLASH_BANKS]; /* info for FLASH chips */
@@ -503,7 +487,7 @@ flash_erase(flash_info_t *info, int s_first, int s_last)
 
        if (haderr > 0) {
                printf (" failed\n");
-               rcode = 1;
+               rcode = 1;
        }
        else
                printf (" done\n");