diff --git a/arch/arm/configs/vendor/sdxnightjar-debug.config b/arch/arm/configs/vendor/sdxnightjar-debug.config
index fd3c60ecd5c7..3ccfd9cb093a 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 dce8fa57bcf3..08e8f7aee237 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
@@ -388,7 +386,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
@@ -396,7 +393,6 @@ CONFIG_SOUNDWIRE=y
 # CONFIG_IPA_WDI_UNIFIED_API is not set
 # CONFIG_QCOM_MINIDUMP is not set
 # CONFIG_CRYPTO_AES is not set
-CONFIG_MFD_SYSCON=y
 CONFIG_MFD_WCD=y
 CONFIG_MSM_SUBSYSTEM_RESTART=y
 CONFIG_DYNAMIC_DEBUG=y
@@ -726,3 +722,43 @@ CONFIG_SPMI_PMIC_CLKDIV=y
 # CONFIG_QTI_ADC_TM is not set
 # CONFIG_QCOM_SPMI_IADC is not set
 # CONFIG_QCOM_SPMI_VADC is not set
+CONFIG_HWSPINLOCK_QCOM=y
+CONFIG_RPMSG_CHAR=y
+CONFIG_RPMSG_QCOM_SMD=y
+CONFIG_MSM_RPM_SMD=y
+CONFIG_REGULATOR_QTI_DEBUG=y
+CONFIG_REGULATOR_RPM_SMD=y
+CONFIG_QGKI=y
+# CONFIG_PERF_KERNEL_SHARE is not set
+# CONFIG_ENABLE_VMALLOC_SAVING is not set
+# CONFIG_QGKI_CPUIDLE_FAILED_STAT is not set
+# CONFIG_QGKI_MENU_GOV_DEBUG is not set
+# CONFIG_PRIORITIZE_OOM_TASKS is not set
+# CONFIG_ENABLE_SFE is not set
+# CONFIG_PCI_QTI is not set
+# CONFIG_REGMAP_QTI_DEBUG is not set
+# CONFIG_ADSPRPC_QGKI is not set
+# CONFIG_QTI_ADC_TM is not set
+# CONFIG_QTI_QMI_SENSOR is not set
+# CONFIG_QTI_BCL_PMIC5 is not set
+# CONFIG_QTI_BCL_SOC_DRIVER is not set
+# CONFIG_QTI_QMI_COOLING_DEVICE is not set
+# CONFIG_QTI_CPU_ISOLATE_COOLING_DEVICE is not set
+# CONFIG_QTI_CPU_VOLTAGE_COOLING_DEVICE is not set
+# CONFIG_QTI_POLICY_ENGINE_SENSOR is not set
+# CONFIG_QTI_DDR_COOLING_DEVICE is not set
+# CONFIG_AUDIO_QGKI is not set
+# CONFIG_USB_FUNC_WAKEUP_SUPPORTED is not set
+# CONFIG_DMABUF_DESTRUCTOR_SUPPORT is not set
+# CONFIG_ION_POOL_AUTO_REFILL is not set
+# CONFIG_COMMON_CLK_QCOM_DEBUG is not set
+# CONFIG_IOMMU_DYNAMIC_DOMAINS is not set
+# CONFIG_IO_PGTABLE_PAGE_ACCOUNTING is not set
+# CONFIG_ARM_SMMU_SKIP_MAP_POWER_ON is not set
+# CONFIG_QCOM_IOMMU_TLBI_QUIRKS is not set
+# 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