From 8632d85be65a4b27bcad1a860d8de45aa2bb2e1b Mon Sep 17 00:00:00 2001 From: "Isaac J. Manjarres" Date: Mon, 21 Jul 2025 23:51:35 +0000 Subject: [PATCH] ANDROID: Have menuconfig sort microdroid defconfigs Menuconfig has its own way of sorting defconfig files, and it is the only tool that should be used for editing defconfig files. Use menuconfig on the microdroid files to avoid configs moving around when editing configs in the future. No functional change. Verified by comparing vmlinux binaries before and after this commit. Bug: 432329937 Change-Id: I57b71b4f446b4314b0d7388bdeffbad29f5e058f Signed-off-by: Isaac J. Manjarres --- arch/arm64/configs/microdroid_defconfig | 16 ++++++---------- arch/x86/configs/microdroid_defconfig | 7 ++----- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/arch/arm64/configs/microdroid_defconfig b/arch/arm64/configs/microdroid_defconfig index f50396c249c2..512bbae47a68 100644 --- a/arch/arm64/configs/microdroid_defconfig +++ b/arch/arm64/configs/microdroid_defconfig @@ -9,12 +9,12 @@ CONFIG_RCU_BOOST=y CONFIG_RCU_NOCB_CPU=y CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y +CONFIG_CGROUPS=y +CONFIG_MEMCG=y # CONFIG_UTS_NS is not set # CONFIG_TIME_NS is not set # CONFIG_PID_NS is not set # CONFIG_NET_NS is not set -CONFIG_CGROUPS=y -CONFIG_MEMCG=y # CONFIG_RD_GZIP is not set # CONFIG_RD_BZIP2 is not set # CONFIG_RD_LZMA is not set @@ -23,11 +23,11 @@ CONFIG_MEMCG=y # CONFIG_RD_ZSTD is not set CONFIG_BOOT_CONFIG=y CONFIG_PROFILING=y +CONFIG_KEXEC_FILE=y CONFIG_ARM64_VA_BITS_39=y CONFIG_SCHED_MC=y CONFIG_NR_CPUS=32 CONFIG_PARAVIRT_TIME_ACCOUNTING=y -CONFIG_KEXEC_FILE=y CONFIG_ARM64_SW_TTBR0_PAN=y # CONFIG_ARM64_BTI_KERNEL is not set CONFIG_RANDOMIZE_BASE=y @@ -73,13 +73,12 @@ CONFIG_PCIEPORTBUS=y CONFIG_PCIEAER=y CONFIG_PCI_IOV=y CONFIG_PCI_HOST_GENERIC=y -CONFIG_PCIE_DW_PLAT_EP=y CONFIG_PCIE_KIRIN=y +CONFIG_PCIE_DW_PLAT_EP=y CONFIG_PCI_ENDPOINT=y CONFIG_FW_LOADER_USER_HELPER=y # CONFIG_FW_CACHE is not set CONFIG_ARM_SCMI_PROTOCOL=y -# CONFIG_ARM_SCMI_POWER_DOMAIN is not set CONFIG_ZRAM=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_LOOP_MIN_COUNT=16 @@ -105,7 +104,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=0 CONFIG_SERIAL_OF_PLATFORM=y CONFIG_NULL_TTY=y CONFIG_VIRTIO_CONSOLE=y -CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_CCTRNG=y # CONFIG_DEVMEM is not set # CONFIG_DEVPORT is not set @@ -131,6 +129,7 @@ CONFIG_VIRTIO_BALLOON=y CONFIG_STAGING=y CONFIG_HWSPINLOCK=y # CONFIG_IOMMU_SUPPORT is not set +# CONFIG_ARM_SCMI_POWER_DOMAIN is not set # CONFIG_ANDROID_KABI_RESERVE is not set # CONFIG_ANDROID_VENDOR_OEM_DATA is not set CONFIG_EXT4_FS=y @@ -151,6 +150,7 @@ CONFIG_STATIC_USERMODEHELPER=y CONFIG_STATIC_USERMODEHELPER_PATH="" CONFIG_SECURITY_SELINUX=y CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y +CONFIG_BUG_ON_DATA_CORRUPTION=y CONFIG_CRYPTO_HCTR2=y CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_SHA1_ARM64_CE=y @@ -170,8 +170,6 @@ CONFIG_HEADERS_INSTALL=y CONFIG_MAGIC_SYSRQ=y CONFIG_UBSAN=y CONFIG_UBSAN_TRAP=y -CONFIG_UBSAN_LOCAL_BOUNDS=y -# CONFIG_UBSAN_SHIFT is not set # CONFIG_UBSAN_BOOL is not set # CONFIG_UBSAN_ENUM is not set CONFIG_PAGE_OWNER=y @@ -183,8 +181,6 @@ CONFIG_PANIC_TIMEOUT=-1 CONFIG_SOFTLOCKUP_DETECTOR=y CONFIG_WQ_WATCHDOG=y CONFIG_SCHEDSTATS=y -# CONFIG_DEBUG_PREEMPT is not set -CONFIG_BUG_ON_DATA_CORRUPTION=y CONFIG_HIST_TRIGGERS=y CONFIG_PID_IN_CONTEXTIDR=y # CONFIG_RUNTIME_TESTING_MENU is not set diff --git a/arch/x86/configs/microdroid_defconfig b/arch/x86/configs/microdroid_defconfig index dbbc3a4b45c5..6761087f3415 100644 --- a/arch/x86/configs/microdroid_defconfig +++ b/arch/x86/configs/microdroid_defconfig @@ -25,6 +25,7 @@ CONFIG_MEMCG=y # CONFIG_RD_LZO is not set CONFIG_BOOT_CONFIG=y CONFIG_PROFILING=y +CONFIG_KEXEC_FILE=y CONFIG_SMP=y CONFIG_X86_X2APIC=y CONFIG_HYPERVISOR_GUEST=y @@ -33,7 +34,6 @@ CONFIG_PARAVIRT_TIME_ACCOUNTING=y CONFIG_NR_CPUS=32 # CONFIG_X86_MCE is not set CONFIG_EFI=y -CONFIG_KEXEC_FILE=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE="stack_depot_disable=on cgroup_disable=pressure ioremap_guard panic=-1 bootconfig acpi=noirq" CONFIG_PM_WAKELOCKS=y @@ -105,7 +105,6 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=0 CONFIG_SERIAL_OF_PLATFORM=y CONFIG_NULL_TTY=y CONFIG_VIRTIO_CONSOLE=y -CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_VIRTIO=y # CONFIG_DEVMEM is not set # CONFIG_DEVPORT is not set @@ -203,6 +202,7 @@ CONFIG_STATIC_USERMODEHELPER=y CONFIG_STATIC_USERMODEHELPER_PATH="" CONFIG_SECURITY_SELINUX=y CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y +CONFIG_BUG_ON_DATA_CORRUPTION=y CONFIG_CRYPTO_HCTR2=y CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_AES_NI_INTEL=y @@ -220,8 +220,6 @@ CONFIG_HEADERS_INSTALL=y CONFIG_MAGIC_SYSRQ=y CONFIG_UBSAN=y CONFIG_UBSAN_TRAP=y -CONFIG_UBSAN_LOCAL_BOUNDS=y -# CONFIG_UBSAN_SHIFT is not set # CONFIG_UBSAN_BOOL is not set # CONFIG_UBSAN_ENUM is not set CONFIG_PAGE_OWNER=y @@ -234,6 +232,5 @@ CONFIG_PANIC_TIMEOUT=-1 CONFIG_SOFTLOCKUP_DETECTOR=y CONFIG_WQ_WATCHDOG=y CONFIG_SCHEDSTATS=y -CONFIG_BUG_ON_DATA_CORRUPTION=y CONFIG_HIST_TRIGGERS=y CONFIG_UNWINDER_FRAME_POINTER=y