diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-04-13 06:37:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-04-13 06:37:36 +0000 |
| commit | b4e829ae9c5d9156517bee441ec0262bb081cd2f (patch) | |
| tree | fdabb548f5c52db4eab6bd879950d8efbc33ad4f | |
| parent | 9dcbdd274d1b0660448c69aac4e3c282013bf244 (diff) | |
| parent | 6d96f205a91accc77d430eb4c7d670d2c8517874 (diff) | |
Merge changes Id33a1ec9,I0621d1e8
* changes:
fragments: do not disable CONFIG_STATIC_RELA
Revert "ANDROID: Work around toolchain issue with CONFIG_STATIC_RELA"
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | qemu-minimal.fragment | 3 | ||||
| -rw-r--r-- | rockpi4.fragment | 3 |
3 files changed, 1 insertions, 7 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index b7dff7f1b2e..cac4fa09fd3 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -114,7 +114,7 @@ config GIC_V3_ITS configuration table can not be re-programmed, unless GICV3 reset. config STATIC_RELA - bool "Static RELA" + bool default y if ARM64 config DMA_ADDR_T_64BIT diff --git a/qemu-minimal.fragment b/qemu-minimal.fragment index a980d85f4f7..3828e406520 100644 --- a/qemu-minimal.fragment +++ b/qemu-minimal.fragment @@ -138,9 +138,6 @@ CONFIG_DM_RNG=y # CONFIG_DISPLAY_BOARDINFO_LATE is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y -# Disable STATIC_RELA as it is broken with clang/llvm on arm64 -# CONFIG_STATIC_RELA is not set - # Enable kernel cmdline to be passed in from VM manager CONFIG_ARCH_MISC_INIT=y diff --git a/rockpi4.fragment b/rockpi4.fragment index 4ed4b822a44..2b0325eaec8 100644 --- a/rockpi4.fragment +++ b/rockpi4.fragment @@ -1,6 +1,3 @@ -# Disable STATIC_RELA as it is broken with clang/llvm on arm64 -# CONFIG_STATIC_RELA is not set - # Disable ARM64_CRC32 as it is broken with clang/llvm on arm64 # CONFIG_ARM64_CRC32 is not set |