diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-14 06:58:26 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2021-07-14 06:58:26 +0200 |
| commit | 7fab7d503cf3c9388db6779c203de2670789da4a (patch) | |
| tree | b8eb9fe3f00bca71e36ac5357acc9c349bf8e4f6 /kernel-aarch64-debug-rhel.config | |
| parent | 8f3f0017691ec9ec0adb94b92084fc1f402df95c (diff) | |
| parent | 58f461d452ca71855ab4a53cf6d36eb8ab1a818f (diff) | |
| download | kernel-7fab7d503cf3c9388db6779c203de2670789da4a.tar.gz kernel-7fab7d503cf3c9388db6779c203de2670789da4a.tar.xz kernel-7fab7d503cf3c9388db6779c203de2670789da4a.zip | |
Merge remote-tracking branch 'origin/rawhide' into rawhide-user-thl-vanilla-fedorakernel-5.14.0-0.rc1.20210713git7fef2edf7cc7.18.vanilla.1.fc35
Diffstat (limited to 'kernel-aarch64-debug-rhel.config')
| -rw-r--r-- | kernel-aarch64-debug-rhel.config | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 7553d6483..ec5f2477e 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -238,8 +238,8 @@ CONFIG_ARCH_XGENE=y # CONFIG_ARCH_ZYNQMP is not set # CONFIG_ARCNET is not set # CONFIG_ARM64_16K_PAGES is not set -# CONFIG_ARM64_4K_PAGES is not set -CONFIG_ARM64_64K_PAGES=y +CONFIG_ARM64_4K_PAGES=y +# CONFIG_ARM64_64K_PAGES is not set CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y CONFIG_ARM64_AMU_EXTN=y CONFIG_ARM64_BTI_KERNEL=y @@ -269,8 +269,7 @@ CONFIG_ARM64_FORCE_52BIT=y CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_LSE_ATOMICS=y CONFIG_ARM64_MTE=y -# CONFIG_ARM64_PA_BITS_48 is not set -CONFIG_ARM64_PA_BITS_52=y +CONFIG_ARM64_PA_BITS_48=y CONFIG_ARM64_PAN=y CONFIG_ARM64_PMEM=y CONFIG_ARM64_PSEUDO_NMI=y @@ -287,9 +286,9 @@ CONFIG_ARM64_TLB_RANGE=y CONFIG_ARM64_UAO=y CONFIG_ARM64_USE_LSE_ATOMICS=y CONFIG_ARM64_USER_VA_BITS_52=y -# CONFIG_ARM64_VA_BITS_42 is not set -# CONFIG_ARM64_VA_BITS_48 is not set -CONFIG_ARM64_VA_BITS_52=y +# CONFIG_ARM64_VA_BITS_39 is not set +CONFIG_ARM64_VA_BITS_48=y +# CONFIG_ARM64_VA_BITS_52 is not set CONFIG_ARM64_VHE=y CONFIG_ARM64=y CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y @@ -1706,7 +1705,7 @@ CONFIG_FB_SIMPLE=y # CONFIG_FB_SM712 is not set # CONFIG_FB_SM750 is not set # CONFIG_FB_SMSCUFX is not set -# CONFIG_FB_SSD1307 is not set +CONFIG_FB_SSD1307=m # CONFIG_FB_TFT is not set CONFIG_FB_TILEBLITTING=y # CONFIG_FB_TRIDENT is not set @@ -4724,7 +4723,7 @@ CONFIG_RTC_INTF_SYSFS=y CONFIG_RTC_NVMEM=y CONFIG_RTC_SYSTOHC_DEVICE="rtc0" CONFIG_RTC_SYSTOHC=y -CONFIG_RT_GROUP_SCHED=y +# CONFIG_RT_GROUP_SCHED is not set # CONFIG_RTL8180 is not set # CONFIG_RTL8187 is not set CONFIG_RTL8188EE=m @@ -5792,10 +5791,10 @@ CONFIG_TCG_ATMEL=m CONFIG_TCG_CRB=y # CONFIG_TCG_INFINEON is not set CONFIG_TCG_NSC=m -# CONFIG_TCG_TIS_I2C_ATMEL is not set +CONFIG_TCG_TIS_I2C_ATMEL=m # CONFIG_TCG_TIS_I2C_CR50 is not set -# CONFIG_TCG_TIS_I2C_INFINEON is not set -# CONFIG_TCG_TIS_I2C_NUVOTON is not set +CONFIG_TCG_TIS_I2C_INFINEON=m +CONFIG_TCG_TIS_I2C_NUVOTON=m # CONFIG_TCG_TIS_SPI is not set # CONFIG_TCG_TIS_ST33ZP24_I2C is not set # CONFIG_TCG_TIS_ST33ZP24_SPI is not set @@ -6585,7 +6584,7 @@ CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_CONSOLE=m CONFIG_VIRTIO_FS=m CONFIG_VIRTIO_INPUT=m -# CONFIG_VIRTIO_IOMMU is not set +CONFIG_VIRTIO_IOMMU=m CONFIG_VIRTIO_MENU=y # CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES is not set CONFIG_VIRTIO_MMIO=m |