projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-net
[platform/kernel/u-boot.git]
/
include
/
flash.h
diff --git
a/include/flash.h
b/include/flash.h
index
dc67cb2
..
70ab435
100644
(file)
--- a/
include/flash.h
+++ b/
include/flash.h
@@
-1,8
+1,7
@@
+/* SPDX-License-Identifier: GPL-2.0+ */
/*
* (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
/*
* (C) Copyright 2000-2005
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#ifndef _FLASH_H_
*/
#ifndef _FLASH_H_
@@
-122,7
+121,7
@@
extern int jedec_flash_match(flash_info_t *info, ulong base);
* return codes from flash_write():
*/
#define ERR_OK 0
* return codes from flash_write():
*/
#define ERR_OK 0
-#define ERR_TIM
OUT
1
+#define ERR_TIM
EOUT
1
#define ERR_NOT_ERASED 2
#define ERR_PROTECTED 4
#define ERR_INVAL 8
#define ERR_NOT_ERASED 2
#define ERR_PROTECTED 4
#define ERR_INVAL 8