From 7d281559c74f868691fd16e975267982f914f491 Mon Sep 17 00:00:00 2001 From: "a@b.com" Date: Thu, 27 Apr 2023 15:52:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=A0=87=E6=95=B4=E7=90=86=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: a@b.com --- arch/arm64/configs/armdesktop_defconfig | 39 +++++++++++++++---------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/arch/arm64/configs/armdesktop_defconfig b/arch/arm64/configs/armdesktop_defconfig index 31e48dee3815..0728934c1800 100644 --- a/arch/arm64/configs/armdesktop_defconfig +++ b/arch/arm64/configs/armdesktop_defconfig @@ -6,16 +6,16 @@ CONFIG_POSIX_MQUEUE=y CONFIG_NO_HZ=y CONFIG_HIGH_RES_TIMERS=y CONFIG_PREEMPT_VOLUNTARY=y -CONFIG_TASK_XACCT=y -CONFIG_TASK_IO_ACCOUNTING=y CONFIG_TASKSTATS=y CONFIG_TASK_DELAY_ACCT=y +CONFIG_TASK_XACCT=y +CONFIG_TASK_IO_ACCOUNTING=y CONFIG_RCU_EXPERT=y CONFIG_RCU_NOCB_CPU=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_LOG_CPU_MAX_BUF_SHIFT=15 -CONFIG_MEMCG=y +#CONFIG_MEMCG=y CONFIG_BLK_CGROUP=y CONFIG_CFS_BANDWIDTH=y CONFIG_RT_GROUP_SCHED=y @@ -41,6 +41,7 @@ CONFIG_SLUB_MEMCG_SYSFS_ON=y # CONFIG_COMPAT_BRK is not set # CONFIG_SLAB_MERGE_DEFAULT is not set CONFIG_PROFILING=y +CONFIG_ZONE_DMA=n CONFIG_ARCH_PHYTIUM=y CONFIG_ARCH_PHYTIUM_MHU=y CONFIG_ARCH_PHYTIUM_RTC=y @@ -49,23 +50,24 @@ CONFIG_ARCH_PHYTIUM_EC=y CONFIG_PHYTIUM_S3_TIMEOUT=y CONFIG_ARM64_VA_BITS_39=y CONFIG_SCHED_MC=y +CONFIG_NR_CPUS=32 CONFIG_NUMA=y CONFIG_NODES_SHIFT=6 CONFIG_KEXEC=y CONFIG_CRASH_DUMP=y CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY=n +CONFIG_ARM64_TAGGED_ADDR_ABI=n CONFIG_COMPAT=y CONFIG_ARMV8_DEPRECATED=y CONFIG_SWP_EMULATION=y CONFIG_CP15_BARRIER_EMULATION=y CONFIG_SETEND_EMULATION=y - # # ARMv8.1 architectural features # # CONFIG_ARM64_HW_AFDBM is not set # CONFIG_ARM64_PAN is not set -#CONFIG_AS_HAS_LSE_ATOMICS=y +CONFIG_AS_HAS_LSE_ATOMICS=n # CONFIG_ARM64_USE_LSE_ATOMICS is not set # CONFIG_ARM64_VHE is not set # end of ARMv8.1 architectural features @@ -83,17 +85,17 @@ CONFIG_SETEND_EMULATION=y # ARMv8.3 architectural features # # CONFIG_ARM64_PTR_AUTH is not set -#CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y -#CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y -#CONFIG_AS_HAS_PAC=y -#CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y +CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=n +CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=n +CONFIG_AS_HAS_PAC=n +CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=n # end of ARMv8.3 architectural features # # ARMv8.4 architectural features # # CONFIG_ARM64_AMU_EXTN is not set -#CONFIG_AS_HAS_ARMV8_4=y +CONFIG_AS_HAS_ARMV8_4=n # CONFIG_ARM64_TLB_RANGE is not set # end of ARMv8.4 architectural features @@ -101,10 +103,10 @@ CONFIG_SETEND_EMULATION=y # ARMv8.5 architectural features # # CONFIG_ARM64_BTI is not set -#CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y +CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=n # CONFIG_ARM64_E0PD is not set # CONFIG_ARCH_RANDOM is not set -#CONFIG_ARM64_AS_HAS_MTE=y +CONFIG_ARM64_AS_HAS_MTE=n # CONFIG_ARM64_MTE is not set # end of ARMv8.5 architectural features @@ -120,7 +122,7 @@ CONFIG_STACKPROTECTOR_PER_TASK=y # # Boot options CONFIG_ARM64_ACPI_PARKING_PROTOCOL=y -CONFIG_CMDLINE="pcie_aspm=off" +CONFIG_CMDLINE="" CONFIG_CMDLINE_EXTEND=y CONFIG_SUSPEND_SKIP_SYNC=y CONFIG_HIBERNATION=y @@ -757,6 +759,7 @@ CONFIG_NFC_S3FWRN5_I2C=m CONFIG_PCI=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI_PCIE=y +CONFIG_PCIEAER=y CONFIG_PCIE_PTM=y CONFIG_PCI_STUB=y CONFIG_PCI_PF_STUB=m @@ -842,8 +845,8 @@ CONFIG_MTD_ONENAND_OTP=y CONFIG_MTD_ONENAND_2X_PROGRAM=y #CONFIG_MTD_LPDDR=m #CONFIG_MTD_SPI_NOR=m -CONFIG_SPI_PHYTIUM_QUADSPI=m -CONFIG_SPI_HISI_SFC=m +#CONFIG_SPI_PHYTIUM_QUADSPI=m +#CONFIG_SPI_HISI_SFC=m #CONFIG_MTD_UBI=m #CONFIG_MTD_UBI_FASTMAP=y #CONFIG_MTD_UBI_GLUEBI=m @@ -873,7 +876,6 @@ CONFIG_VIRTIO_BLK=m CONFIG_BLK_DEV_RBD=m CONFIG_BLK_DEV_RSXX=m CONFIG_BLK_DEV_NVME=m -CONFIG_NR_CPUS=32 CONFIG_NVME_MULTIPATH=y CONFIG_NVME_RDMA=m CONFIG_NVME_FC=m @@ -1602,6 +1604,8 @@ CONFIG_MISDN_SPEEDFAX=m CONFIG_MISDN_INFINEON=m CONFIG_MISDN_W6692=m CONFIG_MISDN_NETJET=m +CONFIG_NVM=y +CONFIG_NVM_PBLK=m # CONFIG_INPUT_LEDS is not set CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV_PSAUX=y @@ -3262,6 +3266,7 @@ CONFIG_INDIRECT_PIO=y CONFIG_CRC_CCITT=y CONFIG_CRC4=m CONFIG_LIBCRC32C=y +CONFIG_IRQ_POLL=y CONFIG_FONTS=y CONFIG_FONT_8x8=y CONFIG_PRINTK_TIME=y @@ -3290,5 +3295,7 @@ CONFIG_FUNCTION_TRACER=y CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_DYNAMIC_FTRACE=y CONFIG_DYNAMIC_FTRACE_WITH_REGS=y +# CONFIG_KPROBE_EVENTS is not set +# CONFIG_UPROBE_EVENTS is not set # CONFIG_STRICT_DEVMEM is not set # CONFIG_RUNTIME_TESTING_MENU is not set