diff options
| author | Simon Glass | 2019-08-24 07:22:45 -0600 |
|---|---|---|
| committer | Simon Glass | 2019-10-15 08:40:02 -0600 |
| commit | 9d44a7e6c67be9661e6d3dff3a2d5da31dd06cbc (patch) | |
| tree | 67fff8a49349c67bba4e985e2d80e8722caa3325 | |
| parent | 8dbb7444ebaa499b753269c88cdd76f12f0fa875 (diff) | |
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>
| -rw-r--r-- | tools/binman/elf.py | 3 | ||||
| -rw-r--r-- | tools/binman/elf_test.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tools/binman/elf.py b/tools/binman/elf.py index af40024ceab..c7ef74ce7df 100644 --- a/tools/binman/elf.py +++ b/tools/binman/elf.py @@ -221,6 +221,9 @@ SECTIONS .empty : { *(.empty) } :empty + /DISCARD/ : { + *(.note.gnu.property) + } .note : { *(.comment) } :note diff --git a/tools/binman/elf_test.py b/tools/binman/elf_test.py index 416e43baf0e..cc6e9c51287 100644 --- a/tools/binman/elf_test.py +++ b/tools/binman/elf_test.py @@ -148,7 +148,7 @@ class TestElf(unittest.TestCase): 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. |