mirror of https://github.com/OpenIPC/firmware.git
127 lines
4.0 KiB
Diff
127 lines
4.0 KiB
Diff
diff -drupN a/arch/arm64/Kconfig b/arch/arm64/Kconfig
|
|
--- a/arch/arm64/Kconfig 2018-08-06 17:23:04.000000000 +0300
|
|
+++ b/arch/arm64/Kconfig 2022-06-12 05:28:14.000000000 +0300
|
|
@@ -15,6 +15,7 @@ config ARM64
|
|
select ARCH_HAS_SG_CHAIN
|
|
select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
|
|
select ARCH_USE_CMPXCHG_LOCKREF
|
|
+ select ARCH_SUPPORTS_LTO_CLANG
|
|
select ARCH_SUPPORTS_ATOMIC_RMW
|
|
select ARCH_SUPPORTS_NUMA_BALANCING
|
|
select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
|
|
@@ -109,6 +110,7 @@ config ARM64
|
|
select POWER_SUPPLY
|
|
select SPARSE_IRQ
|
|
select SYSCTL_EXCEPTION_TRACE
|
|
+ select THREAD_INFO_IN_TASK
|
|
help
|
|
ARM 64-bit (AArch64) Linux support.
|
|
|
|
@@ -417,7 +419,7 @@ config ARM64_ERRATUM_845719
|
|
|
|
config ARM64_ERRATUM_843419
|
|
bool "Cortex-A53: 843419: A load or store might access an incorrect address"
|
|
- default y
|
|
+ default y if !LTO_CLANG
|
|
select ARM64_MODULE_CMODEL_LARGE if MODULES
|
|
help
|
|
This option links the kernel with '--fix-cortex-a53-843419' and
|
|
@@ -852,6 +854,14 @@ config SETEND_EMULATION
|
|
If unsure, say Y
|
|
endif
|
|
|
|
+config ARM64_SW_TTBR0_PAN
|
|
+ bool "Emulate Privileged Access Never using TTBR0_EL1 switching"
|
|
+ help
|
|
+ Enabling this option prevents the kernel from accessing
|
|
+ user-space memory directly by pointing TTBR0_EL1 to a reserved
|
|
+ zeroed area and reserved ASID. The user access routines
|
|
+ restore the valid TTBR0_EL1 temporarily.
|
|
+
|
|
menu "ARMv8.1 architectural features"
|
|
|
|
config ARM64_HW_AFDBM
|
|
@@ -977,7 +987,7 @@ config RANDOMIZE_BASE
|
|
|
|
config RANDOMIZE_MODULE_REGION_FULL
|
|
bool "Randomize the module region independently from the core kernel"
|
|
- depends on RANDOMIZE_BASE && !DYNAMIC_FTRACE
|
|
+ depends on RANDOMIZE_BASE && !DYNAMIC_FTRACE && !LTO_CLANG
|
|
default y
|
|
help
|
|
Randomizes the location of the module region without considering the
|
|
@@ -1011,6 +1021,23 @@ config CMDLINE
|
|
entering them here. As a minimum, you should specify the the
|
|
root device (e.g. root=/dev/nfs).
|
|
|
|
+choice
|
|
+ prompt "Kernel command line type" if CMDLINE != ""
|
|
+ default CMDLINE_FROM_BOOTLOADER
|
|
+
|
|
+config CMDLINE_FROM_BOOTLOADER
|
|
+ bool "Use bootloader kernel arguments if available"
|
|
+ help
|
|
+ Uses the command-line options passed by the boot loader. If
|
|
+ the boot loader doesn't provide any, the default kernel command
|
|
+ string provided in CMDLINE will be used.
|
|
+
|
|
+config CMDLINE_EXTEND
|
|
+ bool "Extend bootloader kernel arguments"
|
|
+ help
|
|
+ The command-line arguments provided by the boot loader will be
|
|
+ appended to the default kernel command string.
|
|
+
|
|
config CMDLINE_FORCE
|
|
bool "Always use the default kernel command string"
|
|
help
|
|
@@ -1018,6 +1045,7 @@ config CMDLINE_FORCE
|
|
loader passes other arguments to the kernel.
|
|
This is useful if you cannot or don't want to change the
|
|
command-line options your boot loader passes to the kernel.
|
|
+endchoice
|
|
|
|
config EFI_STUB
|
|
bool
|
|
@@ -1050,6 +1078,41 @@ config DMI
|
|
However, even with this option, the resultant kernel should
|
|
continue to boot on existing non-UEFI platforms.
|
|
|
|
+config BUILD_ARM64_APPENDED_DTB_IMAGE
|
|
+ bool "Build a concatenated Image.gz/dtb by default"
|
|
+ depends on OF
|
|
+ help
|
|
+ Enabling this option will cause a concatenated Image.gz and list of
|
|
+ DTBs to be built by default (instead of a standalone Image.gz.)
|
|
+ The image will built in arch/arm64/boot/Image.gz-dtb
|
|
+
|
|
+choice
|
|
+ prompt "Appended DTB Kernel Image name"
|
|
+ depends on BUILD_ARM64_APPENDED_DTB_IMAGE
|
|
+ help
|
|
+ Enabling this option will cause a specific kernel image Image or
|
|
+ Image.gz to be used for final image creation.
|
|
+ The image will built in arch/arm64/boot/IMAGE-NAME-dtb
|
|
+
|
|
+ config IMG_GZ_DTB
|
|
+ bool "Image.gz-dtb"
|
|
+ config IMG_DTB
|
|
+ bool "Image-dtb"
|
|
+endchoice
|
|
+
|
|
+config BUILD_ARM64_APPENDED_KERNEL_IMAGE_NAME
|
|
+ string
|
|
+ depends on BUILD_ARM64_APPENDED_DTB_IMAGE
|
|
+ default "Image.gz-dtb" if IMG_GZ_DTB
|
|
+ default "Image-dtb" if IMG_DTB
|
|
+
|
|
+config BUILD_ARM64_APPENDED_DTB_IMAGE_NAMES
|
|
+ string "Default dtb names"
|
|
+ depends on BUILD_ARM64_APPENDED_DTB_IMAGE
|
|
+ help
|
|
+ Space separated list of names of dtbs to append when
|
|
+ building a concatenated Image.gz-dtb.
|
|
+
|
|
endmenu
|
|
|
|
menu "Userspace binary formats"
|