diff options
| author | Ingo Molnar <mingo@kernel.org> | 2022-09-02 11:31:58 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2022-09-02 11:33:33 +0300 |
| commit | 1043897681808118c0f7e70b210774000fe06621 (patch) | |
| tree | ec8c0aa114e8585a73b9a7afddf9e6a6f65e992e /arch/arm/configs/vexpress_defconfig | |
| parent | 652c5bf380ad018e15006a7f8349800245ddbbad (diff) | |
| parent | 42e66b1cc3a070671001f8a1e933a80818a192bf (diff) | |
| download | linux-1043897681808118c0f7e70b210774000fe06621.tar.xz | |
Merge branch 'linus' into x86/mm, to refresh the branch
This branch is ~14k commits behind upstream, and has an old merge base
from early into the merge window, refresh it to v6.0-rc3+fixes before
queueing up new commits.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/configs/vexpress_defconfig')
| -rw-r--r-- | arch/arm/configs/vexpress_defconfig | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/configs/vexpress_defconfig b/arch/arm/configs/vexpress_defconfig index 947987730eb7..4e3a0133e4d3 100644 --- a/arch/arm/configs/vexpress_defconfig +++ b/arch/arm/configs/vexpress_defconfig @@ -20,15 +20,12 @@ CONFIG_MCPM=y CONFIG_VMSPLIT_2G=y CONFIG_NR_CPUS=8 CONFIG_ARM_PSCI=y -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_CMDLINE="console=ttyAMA0" CONFIG_CPU_IDLE=y CONFIG_VFP=y CONFIG_NEON=y CONFIG_MODULES=y CONFIG_MODULE_UNLOAD=y -# CONFIG_BLK_DEV_BSG is not set # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_CMA=y CONFIG_NET=y @@ -56,6 +53,7 @@ CONFIG_MTD_UBI=y CONFIG_VIRTIO_BLK=y # CONFIG_SCSI_PROC_FS is not set CONFIG_BLK_DEV_SD=y +# CONFIG_BLK_DEV_BSG is not set CONFIG_SCSI_VIRTIO=y CONFIG_ATA=y CONFIG_NETDEVICES=y @@ -135,9 +133,9 @@ CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_ISO8859_1=y # CONFIG_CRYPTO_HW is not set CONFIG_DMA_CMA=y -CONFIG_DEBUG_INFO=y -CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_DEBUG_KERNEL=y +CONFIG_MAGIC_SYSRQ=y CONFIG_DETECT_HUNG_TASK=y # CONFIG_SCHED_DEBUG is not set CONFIG_DEBUG_USER=y |