[incubator-nuttx] branch releases/9.0 updated: Remove improper uImage file

[ag...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

aguettouche pushed a commit to branch releases/9.0
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/releases/9.0 by this push:
     new 479fbdb  Remove improper uImage file
479fbdb is described below

commit 479fbdb234666cf1e9d605e78cb77954ff60e988
Author: Gregory Nutt <gn...@nuttx.org>
AuthorDate: Fri Apr 24 09:49:36 2020 -0600

    Remove improper uImage file
    
    Remove boards/arm/sama5/sama5d3-xplained/boot/uImage that can in inadvertantly with a PR merge.
    
    Also, change "/uImage" to just "uImage" in the top-level .gitignore file so that all occurences of uImage will be ignored, not just versions in the nuttx/ top-level directory.
---
 .gitignore                                    |   1 +
 boards/arm/sama5/sama5d3-xplained/boot/uImage | Bin 212281 -> 0 bytes
 2 files changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index ff0b160..1296e8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,7 @@ Make.dep
 .swp
 .*.swp
 core
+uImage
 /.gdbinit
 /cscope.*
 /.config
diff --git a/boards/arm/sama5/sama5d3-xplained/boot/uImage b/boards/arm/sama5/sama5d3-xplained/boot/uImage
deleted file mode 100755
index 1d1a9ad..0000000
Binary files a/boards/arm/sama5/sama5d3-xplained/boot/uImage and /dev/null differ