Skip to content

Commit e58568e

Browse files
committed
Upgrade u-boot to version 2020.07
1 parent 5a61c41 commit e58568e

File tree

15,855 files changed

+1163677
-352472
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

15,855 files changed

+1163677
-352472
lines changed

.gitignore

100644100755
Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,47 @@
33
# subdirectories here. Add them in the ".gitignore" file
44
# in that subdirectory instead.
55
#
6-
# Normal rules
6+
# Normal rules (sorted alphabetically)
77
#
88
.*
9-
*.o
10-
*.o.*
119
*.a
12-
*.s
13-
*.su
14-
*.mod.c
10+
*.asn1.[ch]
11+
*.bin
12+
*.cfgout
13+
*.dtb
14+
*.dtbo
15+
*.dtb.S
16+
*.elf
17+
*.exe
18+
*.gcda
19+
*.gcno
1520
*.i
21+
*.img
22+
*.lex.c
1623
*.lst
24+
*.mod.c
25+
*.o
26+
*.o.*
1727
*.order
18-
*.elf
19-
*.swp
20-
*.bin
2128
*.patch
22-
*.cfgtmp
23-
24-
# host programs on Cygwin
25-
*.exe
29+
*.s
30+
*.su
31+
*.swp
32+
*.tab.[ch]
2633

2734
# Build tree
2835
/build-*
2936

3037
#
3138
# Top-level generic files
3239
#
33-
fit-dtb.blob
40+
fit-dtb.blob*
3441
/MLO*
3542
/SPL*
3643
/System.map
3744
/u-boot*
3845
/boards.cfg
46+
/*.log
3947

4048
#
4149
# git files that we don't want to ignore even it they are dot-files
@@ -46,7 +54,6 @@ fit-dtb.blob
4654
#
4755
# Generated files
4856
#
49-
/LOG
5057
/spl/
5158
/tpl/
5259
/defconfig

.mailmap

100644100755
Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,39 @@
44
# and/or not always written the same way, making contributions from the
55
# same person appearing not to be so or badly displayed.
66
#
7+
# This file is also used by scripts/get_maintainer.pl.
8+
#
79
# This file can be modified by hand or updated by the following command:
810
# scripts/mailmapper > tmp; mv tmp .mailmap
911
#
12+
# Entries in this file take one of the following forms:
13+
# Proper Name <commit@email.xx>
14+
# <proper@email.xx> <commit@email.xx>
15+
# Proper Name <proper@email.xx> <commit@email.xx>
16+
# Proper Name <proper@email.xx> Commit Name <commit@email.xx>
1017

18+
Alexander Graf <agraf@csgraf.de> <agraf@suse.de>
1119
Allen Martin <amartin@nvidia.com>
1220
Andreas Bießmann <andreas.devel@googlemail.com>
1321
Andreas Bießmann <andreas@biessmann.org>
1422
Aneesh V <aneesh@ti.com>
23+
Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>
24+
Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>
1525
Dirk Behme <dirk.behme@googlemail.com>
1626
Fabio Estevam <fabio.estevam@nxp.com>
1727
Jagan Teki <402jagan@gmail.com>
1828
Jagan Teki <jaganna@gmail.com>
1929
Jagan Teki <jaganna@xilinx.com>
2030
Jagan Teki <jagannadh.teki@gmail.com>
2131
Jagan Teki <jagannadha.sutradharudu-teki@xilinx.com>
32+
Igor Opaniuk <igor.opaniuk@gmail.com> <igor.opaniuk@linaro.org>
2233
Markus Klotzbuecher <mk@denx.de>
2334
Paul Burton <paul.burton@mips.com> <paul.burton@imgtec.com>
2435
Prabhakar Kushwaha <prabhakar@freescale.com>
2536
Rajeshwari Shinde <rajeshwari.s@samsung.com>
26-
Ricardo Ribalda <ricardo.ribalda@uam.es>
27-
Ricardo Ribalda <ricardo.ribalda@gmail.com>
37+
Ricardo Ribalda <ricardo@ribalda.com> <ricardo.ribalda@uam.es>
38+
Ricardo Ribalda <ricardo@ribalda.com> <ricardo.ribalda@gmail.com>
39+
Ruchika Gupta <ruchika.gupta@nxp.com> <ruchika.gupta@freescale.com>
2840
Sandeep Paulraj <s-paulraj@ti.com>
2941
Shaohui Xie <Shaohui.Xie@freescale.com>
3042
Stefan Roese <stroese>
@@ -34,3 +46,5 @@ Wolfgang Denk <wdenk>
3446
York Sun <yorksun@freescale.com>
3547
York Sun <york.sun@nxp.com>
3648
Łukasz Majewski <l.majewski@samsung.com>
49+
Lukasz Majewski <lukma@denx.de>
50+
Mirza <Taimoor_Mirza@mentor.com>

Kbuild

Lines changed: 5 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,20 @@
1+
# SPDX-License-Identifier: GPL-2.0
12
#
23
# Kbuild for top-level directory of U-Boot
3-
# This file takes care of the following:
4-
# 1) Generate generic-asm-offsets.h
5-
# 2) Generate asm-offsets.h
6-
7-
# Default sed regexp - multiline due to syntax constraints
8-
define sed-y
9-
"s:[[:space:]]*\.ascii[[:space:]]*\"\(.*\)\":\1:; \
10-
/^->/{s:->#\(.*\):/* \1 */:; \
11-
s:^->\([^ ]*\) [\$$#]*\([-0-9]*\) \(.*\):#define \1 \2 /* \3 */:; \
12-
s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; \
13-
s:->::; p;}"
14-
endef
15-
16-
# Use filechk to avoid rebuilds when a header changes, but the resulting file
17-
# does not
18-
define filechk_offsets
19-
(set -e; \
20-
echo "#ifndef $2"; \
21-
echo "#define $2"; \
22-
echo "/*"; \
23-
echo " * DO NOT MODIFY."; \
24-
echo " *"; \
25-
echo " * This file was generated by Kbuild"; \
26-
echo " */"; \
27-
echo ""; \
28-
sed -ne $(sed-y); \
29-
echo ""; \
30-
echo "#endif" )
31-
endef
324

335
#####
34-
# 1) Generate generic-asm-offsets.h
6+
# Generate generic-asm-offsets.h
357

368
generic-offsets-file := include/generated/generic-asm-offsets.h
379

3810
always := $(generic-offsets-file)
3911
targets := lib/asm-offsets.s
4012

41-
# We use internal kbuild rules to avoid the "is up to date" message from make
42-
lib/asm-offsets.s: lib/asm-offsets.c FORCE
43-
$(Q)mkdir -p $(dir $@)
44-
$(call if_changed_dep,cc_s_c)
45-
46-
$(obj)/$(generic-offsets-file): lib/asm-offsets.s FORCE
13+
$(obj)/$(generic-offsets-file): $(obj)/lib/asm-offsets.s FORCE
4714
$(call filechk,offsets,__GENERIC_ASM_OFFSETS_H__)
4815

4916
#####
50-
# 2) Generate asm-offsets.h
51-
#
17+
# Generate asm-offsets.h
5218

5319
ifneq ($(wildcard $(srctree)/arch/$(ARCH)/lib/asm-offsets.c),)
5420
offsets-file := include/generated/asm-offsets.h
@@ -59,10 +25,5 @@ targets += arch/$(ARCH)/lib/asm-offsets.s
5925

6026
CFLAGS_asm-offsets.o := -DDO_DEPS_ONLY
6127

62-
# We use internal kbuild rules to avoid the "is up to date" message from make
63-
arch/$(ARCH)/lib/asm-offsets.s: arch/$(ARCH)/lib/asm-offsets.c FORCE
64-
$(Q)mkdir -p $(dir $@)
65-
$(call if_changed_dep,cc_s_c)
66-
67-
$(obj)/$(offsets-file): arch/$(ARCH)/lib/asm-offsets.s FORCE
28+
$(obj)/$(offsets-file): $(obj)/arch/$(ARCH)/lib/asm-offsets.s FORCE
6829
$(call filechk,offsets,__ASM_OFFSETS_H__)

0 commit comments

Comments
 (0)