diff options
| author | Tom Rini <trini@konsulko.com> | 2021-06-23 15:46:26 +0300 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-06-23 15:46:26 +0300 |
| commit | fcf3981161140d265b873a5b609b8867328dc9dc (patch) | |
| tree | 5542a322551d604c1f0ba5ff910984480b57ec7c /arch | |
| parent | c3a095d1ce16c4a416d831223e10dd95c15f3780 (diff) | |
| parent | f68d5a66cd53a238d64d79cdd330b4dce17c7197 (diff) | |
| download | u-boot-fcf3981161140d265b873a5b609b8867328dc9dc.tar.xz | |
Merge https://source.denx.de/u-boot/custodians/u-boot-x86
- x86: Discard .note.gnu.property sections
- nvme: Skip block device creation for inactive namespaces
- nvme: Convert NVMe doc to reST, and various minor fixes
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/cpu/u-boot-64.lds | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/u-boot-spl.lds | 1 | ||||
| -rw-r--r-- | arch/x86/cpu/u-boot.lds | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/cpu/u-boot-64.lds b/arch/x86/cpu/u-boot-64.lds index 98c7f8e9c5..ee0812aefb 100644 --- a/arch/x86/cpu/u-boot-64.lds +++ b/arch/x86/cpu/u-boot-64.lds @@ -107,4 +107,5 @@ SECTIONS /DISCARD/ : { *(.plt*) } /DISCARD/ : { *(.interp*) } /DISCARD/ : { *(.gnu*) } + /DISCARD/ : { *(.note.gnu.property) } } diff --git a/arch/x86/cpu/u-boot-spl.lds b/arch/x86/cpu/u-boot-spl.lds index 4a655bf9b5..346f60bdac 100644 --- a/arch/x86/cpu/u-boot-spl.lds +++ b/arch/x86/cpu/u-boot-spl.lds @@ -82,6 +82,7 @@ SECTIONS /DISCARD/ : { *(.plt*) } /DISCARD/ : { *(.interp*) } /DISCARD/ : { *(.gnu*) } + /DISCARD/ : { *(.note.gnu.property) } #if defined(CONFIG_SPL_X86_16BIT_INIT) || defined(CONFIG_TPL_X86_16BIT_INIT) /* diff --git a/arch/x86/cpu/u-boot.lds b/arch/x86/cpu/u-boot.lds index a283c290ee..22fde01e74 100644 --- a/arch/x86/cpu/u-boot.lds +++ b/arch/x86/cpu/u-boot.lds @@ -105,6 +105,7 @@ SECTIONS /DISCARD/ : { *(.plt*) } /DISCARD/ : { *(.interp*) } /DISCARD/ : { *(.gnu*) } + /DISCARD/ : { *(.note.gnu.property) } #ifdef CONFIG_X86_16BIT_INIT /* |