summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2025-06-09 09:18:26 -0600
committerTom Rini <trini@konsulko.com>2025-06-09 09:18:26 -0600
commit7966c78429127b43d688a053ef5b54bf0d94fdf3 (patch)
tree89307143759af40875c9ef6046308a3de63b8f63
parenta854c12062c4ae4765c85a5496c21f3d789db082 (diff)
parent0a7610c97ae6af8d2681e361eb24fce1cd63194d (diff)
Merge patch series "arm: armv7: fix a bug that prevents CONFIG_BLOBLIST and CONFIG_POSITION_INDEPENDENT to be enabled together"
Yang Xiwen <forbidden405@outlook.com> says: This patchset also enables CONFIG_POSITION_INDEPENDENT for qemu boards to avoid similar issues to happen again in the future. Link: https://lore.kernel.org/r/20250531-pie_blob_fix-v1-0-7b4a37987dbc@outlook.com
-rw-r--r--arch/arm/Kconfig1
-rw-r--r--arch/arm/cpu/armv7/start.S2
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 79f60eb3f34..6ff3f2750ea 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1091,6 +1091,7 @@ config ARCH_QEMU
imply USB_XHCI_PCI
imply USB_KEYBOARD
imply CMD_USB
+ imply POSITION_INDEPENDENT
config ARCH_RENESAS
bool "Renesas ARM SoCs"
diff --git a/arch/arm/cpu/armv7/start.S b/arch/arm/cpu/armv7/start.S
index 959251957de..833486817f8 100644
--- a/arch/arm/cpu/armv7/start.S
+++ b/arch/arm/cpu/armv7/start.S
@@ -182,6 +182,8 @@ saved_args:
.word 0
.endr
END(saved_args)
+
+ .section .text
#endif
#ifdef CONFIG_ARMV7_LPAE