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

[u-boot] / board / cobra5272 / flash.c

diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c
index e8f02eb8121b61953ada93e990c0184778b00cf5..e5edc2a0401e9ae1a58df7ee2dbfde9d86fd8283 100644 (file)
--- a/board/cobra5272/flash.c
+++ b/board/cobra5272/flash.c
@@ -1,27 +1,11 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2000-2003
  * 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
  */
 
 #include <common.h>
+#include <console.h>
 
 #define PHYS_FLASH_1 CONFIG_SYS_FLASH_BASE
 #define FLASH_BANK_SIZE 0x200000
@@ -231,7 +215,7 @@ int flash_erase (flash_info_t * info, int s_first, int s_last)
                                goto outahere;
                        }
                        if (chip1 == TMO) {
-                               rc = ERR_TIMOUT;
+                               rc = ERR_TIMEOUT;
                                goto outahere;
                        }