defconfig: fix mistakes

arch/arm64/configs/merge_kirin970_defconfig

@@ -360,9 +360,10 @@ CONFIG_IOSCHED_ROW=y
 # CONFIG_IOSCHED_MAPLE is not set
 # CONFIG_IOSCHED_SIOPLUS is not set
 # CONFIG_IOSCHED_ZEN is not set
-CONFIG_IOSCHED_CFQ=m
+CONFIG_IOSCHED_CFQ=y
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_DEFAULT_ROW=y
+# CONFIG_DEFAULT_CFQ is not set
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_ROW_OPTIMIZATION=y
 CONFIG_DEFAULT_IOSCHED="row"
@@ -706,13 +707,13 @@ CONFIG_CPU_FREQ_TIMES=y
 CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
 # CONFIG_CPU_FREQ_DEFAULT_GOV_BLU_SCHEDUTIL is not set
 CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-CONFIG_CPU_FREQ_GOV_INTERACTIVE=m
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_INTERACTIVE=y
 CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
-CONFIG_CPU_FREQ_GOV_BLU_SCHEDUTIL=m
+CONFIG_CPU_FREQ_GOV_BLU_SCHEDUTIL=y
 
 #
 # CPU frequency scaling drivers
@@ -787,7 +788,7 @@ CONFIG_INET_UDP_DIAG=y
 CONFIG_INET_DIAG_DESTROY=y
 CONFIG_TCP_CONG_ADVANCED=y
 # CONFIG_TCP_CONG_BIC is not set
-CONFIG_TCP_CONG_CUBIC=m
+CONFIG_TCP_CONG_CUBIC=y
 # CONFIG_TCP_CONG_WESTWOOD is not set
 # CONFIG_TCP_CONG_HTCP is not set
 # CONFIG_TCP_CONG_HSTCP is not set
@@ -807,6 +808,7 @@ CONFIG_TCP_CONG_CUBIC=m
 # CONFIG_TCP_CONG_WVEGAS is not set
 # CONFIG_TCP_CONG_BALIA is not set
 CONFIG_TCP_CONG_BBRPLUS=y
+# CONFIG_DEFAULT_CUBIC is not set
 CONFIG_DEFAULT_BBRPLUS=y
 # CONFIG_DEFAULT_RENO is not set
 CONFIG_DEFAULT_TCP_CONG="bbrplus"
@@ -1470,7 +1472,7 @@ CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=8192
 # CONFIG_CDROM_PKTCDVD is not set
 # CONFIG_ATA_OVER_ETH is not set
-# CONFIG_VIRTIO_BLK is not set
+CONFIG_VIRTIO_BLK=m
 # CONFIG_BLK_DEV_RBD is not set
 # CONFIG_BLK_DEV_RSXX is not set
 # CONFIG_BLK_DEV_NVME is not set
@@ -1732,7 +1734,7 @@ CONFIG_DUMMY=y
 CONFIG_TUN=y
 # CONFIG_TUN_VNET_CROSS_LE is not set
 # CONFIG_VETH is not set
-# CONFIG_VIRTIO_NET is not set
+CONFIG_VIRTIO_NET=m
 # CONFIG_NLMON is not set
 # CONFIG_ARCNET is not set
 

menuconfig.sh

@@ -9,4 +9,4 @@ export CROSS_COMPILE=aarch64-none-linux-gnu-
 # 填写你自己的主机名
 export KBUILD_BUILD_HOST=PC
 
-make O=../OUT menuconfig
+make O=../OUT xconfig