diff --git a/arch/arm/configs/meson32_defconfig b/arch/arm/configs/meson32_defconfig
index 8f9e024b09a2..916ed2539194 100644
--- a/arch/arm/configs/meson32_defconfig
+++ b/arch/arm/configs/meson32_defconfig
@@ -324,8 +324,6 @@ CONFIG_TIMER_STATS=y
 CONFIG_DEBUG_ATOMIC_SLEEP=y
 CONFIG_KEYS=y
 # CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_SEQIV=y
 CONFIG_CRYPTO_LZO=y
 CONFIG_CRYPTO_USER_API_SKCIPHER=y
 # CONFIG_CRYPTO_HW is not set
diff --git a/arch/arm64/configs/meson64_defconfig b/arch/arm64/configs/meson64_defconfig
index 565bd376342f..c475fc926ba4 100644
--- a/arch/arm64/configs/meson64_defconfig
+++ b/arch/arm64/configs/meson64_defconfig
@@ -165,7 +165,6 @@ CONFIG_AMLOGIC_PINCTRL=y
 CONFIG_AMLOGIC_USB=y
 CONFIG_AMLOGIC_USB_DWC_OTG_HCD=y
 CONFIG_AMLOGIC_USB_HOST_ELECT_TEST=y
-CONFIG_USB_CONFIGFS_UEVENT=y
 CONFIG_AMLOGIC_USBPHY=y
 CONFIG_AMLOGIC_USB2PHY=y
 CONFIG_AMLOGIC_USB3PHY=y
@@ -222,8 +221,6 @@ CONFIG_AMLOGIC_MEDIA_VIN=y
 CONFIG_AMLOGIC_MEDIA_TVIN=y
 CONFIG_AMLOGIC_MEDIA_VDIN=y
 CONFIG_AMLOGIC_MEDIA_VIUIN=y
-CONFIG_AMLOGIC_MEDIA_ENHANCEMENT=y
-CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_VECM=y
 CONFIG_AMLOGIC_VIDEO_PROCESSOR=y
 CONFIG_AMLOGIC_V4L_VIDEO=y
 CONFIG_AMLOGIC_V4L_VIDEO2=y
@@ -231,6 +228,8 @@ CONFIG_AMLOGIC_POST_PROCESS_MANAGER=y
 CONFIG_AMLOGIC_POST_PROCESS_MANAGER_PPSCALER=y
 CONFIG_AMLOGIC_VIDEOBUF2_ION=y
 CONFIG_AMLOGIC_IONVIDEO=y
+CONFIG_AMLOGIC_MEDIA_ENHANCEMENT=y
+CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_VECM=y
 CONFIG_AMLOGIC_MMC=y
 CONFIG_AMLOGIC_NAND=y
 CONFIG_AMLOGIC_VRTC=y
@@ -348,6 +347,7 @@ CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_RNDIS=y
 CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_USB_CONFIGFS_F_MTP=y
+CONFIG_USB_CONFIGFS_UEVENT=y
 CONFIG_MMC=y
 CONFIG_MMC_BLOCK_MINORS=32
 CONFIG_MMC_ARMMMCI=y
@@ -438,4 +438,3 @@ CONFIG_CRYPTO_USER_API_HASH=y
 CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_CRC_T10DIF=y
 CONFIG_CRC7=y
-