commit 9d44a7e6c67be9661e6d3dff3a2d5da31dd06cbc
author Simon Glass <sjg@chromium.org> Sat Aug 24 07:22:45 2019 -0600
committer Simon Glass <sjg@chromium.org> Tue Oct 15 08:40:02 2019 -0600
tree 67fff8a49349c67bba4e985e2d80e8722caa3325
parent 8dbb7444ebaa499b753269c88cdd76f12f0fa875

binman: Drop .note section from ELF

Recent versions of binutils add a '.note.gnu.property' into the ELF file.
This is not required and interferes with the expected output. Drop it.

Also fix testMakeElf() to use a different file for input and output.

Signed-off-by: Simon Glass <sjg@chromium.org>

tools/binman/elf.py

diff --git a/tools/binman/elf.py b/tools/binman/elf.py
index af40024..c7ef74c 100644
--- a/tools/binman/elf.py
+++ b/tools/binman/elf.py
@@ -221,6 +221,9 @@
     .empty : {
         *(.empty)
     } :empty
+    /DISCARD/ : {
+        *(.note.gnu.property)
+    }
     .note : {
         *(.comment)
     } :note

tools/binman/elf_test.py

diff --git a/tools/binman/elf_test.py b/tools/binman/elf_test.py
index 416e43b..cc6e9c5 100644
--- a/tools/binman/elf_test.py
+++ b/tools/binman/elf_test.py
@@ -148,7 +148,7 @@
         expected_text = b'1234'
         expected_data = b'wxyz'
         elf_fname = os.path.join(outdir, 'elf')
-        bin_fname = os.path.join(outdir, 'elf')
+        bin_fname = os.path.join(outdir, 'bin')
 
         # Make an Elf file and then convert it to a fkat binary file. This
         # should produce the original data.