diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-12-10 05:41:25 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-12-10 05:41:25 +0100 |
| commit | 293e981e7452511a876431aa076c0eb256623124 (patch) | |
| tree | c15e999a2f1c69cb193c5f1a1015bbc095dcd33d /arch | |
| parent | 056196ba04574d4f8cf11d92df09eb664a3e62dd (diff) | |
| parent | 5451508c4ff5d8f1d0c115963508b2ca7120141a (diff) | |
| download | barebox-293e981e7452511a876431aa076c0eb256623124.tar.gz barebox-293e981e7452511a876431aa076c0eb256623124.tar.xz | |
Merge branch 'for-next/pci'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/x86/mach-efi/elf_x86_64_efi.lds.S | 7 |
2 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9589a6a511..a4a4e03a56 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -106,6 +106,7 @@ config ARCH_LAYERSCAPE select COMMON_CLK select CLKDEV_LOOKUP select COMMON_CLK_OF_PROVIDER + select HW_HAS_PCI config ARCH_MVEBU bool "Marvell EBU platforms" diff --git a/arch/x86/mach-efi/elf_x86_64_efi.lds.S b/arch/x86/mach-efi/elf_x86_64_efi.lds.S index 40a9425034..ed79118a36 100644 --- a/arch/x86/mach-efi/elf_x86_64_efi.lds.S +++ b/arch/x86/mach-efi/elf_x86_64_efi.lds.S @@ -58,12 +58,7 @@ SECTIONS . = ALIGN(4096); .rela : { - *(.rela.data*) - *(.rela.barebox*) - *(.rela.initcall*) - *(.rela.exitcall*) - *(.rela.got) - *(.rela.stab) + *(.rela*) } . = ALIGN(4096); |