diff --git a/arch/arm64/configs/am6xxx_defconfig b/arch/arm64/configs/am6xxx_defconfig
index f68f89fedf01..3ef45b31a749 100644
--- a/arch/arm64/configs/am6xxx_defconfig
+++ b/arch/arm64/configs/am6xxx_defconfig
@@ -150,7 +150,6 @@ CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_GACT=m
 CONFIG_NET_ACT_MIRRED=m
 CONFIG_NET_ACT_GATE=m
-CONFIG_NET_SWITCHDEV=y
 CONFIG_CGROUP_NET_PRIO=y
 # CONFIG_WIRELESS is not set
 CONFIG_NFC=y
@@ -372,6 +371,11 @@ CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y
 CONFIG_IOMMU_IO_PGTABLE_DART=y
 CONFIG_ARM_SMMU=y
 CONFIG_ARM_SMMU_V3=y
+CONFIG_REMOTEPROC=y
+CONFIG_REMOTEPROC_CDEV=y
+CONFIG_TI_K3_DSP_REMOTEPROC=y
+CONFIG_TI_K3_M4_REMOTEPROC=y
+CONFIG_TI_K3_R5_REMOTEPROC=y
 CONFIG_SOC_BRCMSTB=y
 CONFIG_TI_SCI_PM_DOMAINS=y
 CONFIG_PM_DEVFREQ=y
@@ -403,7 +407,6 @@ CONFIG_NTFS3_FS=m
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_HUGETLBFS=y
-CONFIG_CONFIGFS_FS=y
 CONFIG_SQUASHFS=y
 CONFIG_PSTORE=y
 CONFIG_PSTORE_CONSOLE=y
@@ -452,8 +455,6 @@ CONFIG_SYSTEM_TRUSTED_KEYRING=y
 CONFIG_PACKING=y
 CONFIG_INDIRECT_PIO=y
 CONFIG_CRC_CCITT=m
-CONFIG_CRC_T10DIF=y
-CONFIG_CRC64_ROCKSOFT=y
 CONFIG_CRC_ITU_T=y
 CONFIG_CRC7=y
 CONFIG_CRC8=y