Merge remote-tracking branch 'github.com/Xilinx/u-boot-xlnx/master'

pthomas · Mar 12, 2019 · cb8552b · cb8552b
2 parents 584e21c + 195c620
commit cb8552b
Show file tree

Hide file tree

Showing 12,449 changed files with 463,483 additions and 162,191 deletions.
diff --git a/.checkpatch.conf b/.checkpatch.conf
@@ -25,3 +25,6 @@
 # Ignore "WARNING: Prefer ether_addr_copy() over memcpy() if the Ethernet
 # addresses are __aligned(2)".
 --ignore PREFER_ETHER_ADDR_COPY
+
+# A bit shorter of a description is OK with us.
+--min-conf-desc-length=2
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -0,0 +1,3 @@
+Please do not submit a Pull Request via github.  Our project makes use of
+mailing lists for patch submission and review.  For more details please
+see https://www.denx.de/wiki/U-Boot/Patches
diff --git a/.gitignore b/.gitignore
@@ -3,26 +3,30 @@
 # subdirectories here. Add them in the ".gitignore" file
 # in that subdirectory instead.
 #
-# Normal rules
+# Normal rules (sorted alphabetically)
 #
 .*
-*.o
-*.o.*
 *.a
-*.s
-*.su
-*.mod.c
+*.bin
+*.cfgout
+*.dtb
+*.dtb.S
+*.elf
+*.exe
+*.gcda
+*.gcno
 *.i
+*.lex.c
 *.lst
+*.mod.c
+*.o
+*.o.*
 *.order
-*.elf
-*.swp
-*.bin
 *.patch
-*.cfgtmp
-
-# host programs on Cygwin
-*.exe
+*.s
+*.su
+*.swp
+*.tab.[ch]
 
 # Build tree
 /build-*
@@ -46,7 +50,6 @@ fit-dtb.blob
 #
 # Generated files
 #
-/LOG
 /spl/
 /tpl/
 /defconfig

diff --git a/.mailmap b/.mailmap
@@ -34,3 +34,5 @@ Wolfgang Denk <wdenk>
 York Sun <[email protected]>
 York Sun <[email protected]>
 Łukasz Majewski <[email protected]>
+Lukasz Majewski <[email protected]>
+Mirza <[email protected]>