diff --git a/arch/arm/configs/vendor/sdxnightjar-debug.config b/arch/arm/configs/vendor/sdxnightjar-debug.config
index c2b24f92fe1a..ea408c32b752 100644
--- a/arch/arm/configs/vendor/sdxnightjar-debug.config
+++ b/arch/arm/configs/vendor/sdxnightjar-debug.config
@@ -15,7 +15,6 @@ CONFIG_FAIL_PAGE_ALLOC=y
 CONFIG_FAULT_INJECTION_DEBUG_FS=y
 CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y
 CONFIG_DEBUG_USER=y
-# CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_IOMMU_DEBUG=y
 CONFIG_IOMMU_TESTS=y
 CONFIG_IOMMU_TLBSYNC_DEBUG=y
diff --git a/arch/arm/configs/vendor/sdxnightjar.config b/arch/arm/configs/vendor/sdxnightjar.config
index 1fd0fe9d313a..9aece7e5d23a 100644
--- a/arch/arm/configs/vendor/sdxnightjar.config
+++ b/arch/arm/configs/vendor/sdxnightjar.config
@@ -3,7 +3,6 @@ CONFIG_MSM_BOOT_STATS=y
 CONFIG_QCOM_SMEM=y
 CONFIG_SLIMBUS=y
 CONFIG_IPC_LOGGING=y
-# CONFIG_USB_GADGET_DEBUG_FS is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_PROXY_CONSUMER=y
 CONFIG_REGULATOR_STUB=y
@@ -42,7 +41,6 @@ CONFIG_USB_DWC3=y
 CONFIG_USB_DWC3_MSM=y
 CONFIG_USB_QCOM_EMU_PHY=y
 CONFIG_USB_MSM_SSPHY_QMP=y
-CONFIG_MSM_HSUSB_PHY=y
 CONFIG_USB_CONFIGFS=y
 CONFIG_USB_CONFIGFS_UEVENT=y
 CONFIG_USB_CONFIGFS_MASS_STORAGE=y
@@ -384,7 +382,6 @@ CONFIG_GPIO_SYSFS=y
 CONFIG_POWER_RESET_MSM=y
 CONFIG_QCOM_POWER_SUPPLY=y
 CONFIG_MSM_QUSB_PHY=y
-CONFIG_USB_GADGET_DEBUG_FS=y
 CONFIG_QCOM_SPS_DMA=y
 CONFIG_UIO_MSM_SHAREDMEM=y
 CONFIG_USB_BAM=y
@@ -758,3 +755,6 @@ CONFIG_QGKI=y
 # CONFIG_MSM_PERFORMANCE_QGKI is not set
 # CONFIG_QCOM_RTB_QGKI is not set
 # CONFIG_CORESIGHT_QGKI is not set
+CONFIG_USB_EHSET_TEST_FIXTURE=y
+CONFIG_USB_LOW_MEM_VARIANT=y
+# CONFIG_MSM_HSUSB_PHY is not set