projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'u-boot-atmel-fixes-2020.04-a' of https://gitlab.denx.de/u-boot/custodians...
[oweals/u-boot.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index 0af89e0a788174452b9bfedcedda95a5c73c7063..07539ca5968633219bbe4fc39405e65f18d6bf63 100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-3,7
+3,7
@@
VERSION = 2020
PATCHLEVEL = 04
SUBLEVEL =
VERSION = 2020
PATCHLEVEL = 04
SUBLEVEL =
-EXTRAVERSION = -rc
2
+EXTRAVERSION = -rc
3
NAME =
# *DOCUMENTATION*
NAME =
# *DOCUMENTATION*
@@
-1830,7
+1830,7
@@
define filechk_defaultenv.h
(grep -v '^#' | \
grep -v '^$$' | \
tr '\n' '\0' | \
(grep -v '^#' | \
grep -v '^$$' | \
tr '\n' '\0' | \
- sed -e 's/\\\x0
/\n
/g' | \
+ sed -e 's/\\\x0
\s*/
/g' | \
xxd -i ; echo ", 0x00" ; )
endef
xxd -i ; echo ", 0x00" ; )
endef