diff --git a/src/soc/qualcomm/x1p42100/Kconfig b/src/soc/qualcomm/x1p42100/Kconfig
index d9d6a939af..7aa6481581 100644
--- a/src/soc/qualcomm/x1p42100/Kconfig
+++ b/src/soc/qualcomm/x1p42100/Kconfig
@@ -3,7 +3,6 @@
 config SOC_QUALCOMM_X1P42100
 	bool
 	default n
-	depends on USE_QC_BLOBS
 	select ARCH_BOOTBLOCK_ARMV8_64
 	select ARCH_RAMSTAGE_ARMV8_64
 	select ARCH_ROMSTAGE_ARMV8_64
@@ -28,6 +27,13 @@ config SOC_QUALCOMM_X1P42100
 
 if SOC_QUALCOMM_X1P42100
 
+config QC_BLOBS_UPSTREAM
+	bool "QC blobs are available in upstream repository"
+	select USE_QC_BLOBS
+	default n
+	help
+	  Select based on availability of QC blobs in upstream coreboot `3rdparty/qc_blobs`.
+
 config MEMLAYOUT_LD_FILE
 	string
 	default "src/soc/qualcomm/x1p42100/memlayout.ld"
diff --git a/src/soc/qualcomm/x1p42100/Makefile.mk b/src/soc/qualcomm/x1p42100/Makefile.mk
index 7627320dbc..7a8b928930 100644
--- a/src/soc/qualcomm/x1p42100/Makefile.mk
+++ b/src/soc/qualcomm/x1p42100/Makefile.mk
@@ -47,9 +47,11 @@ CPPFLAGS_common += -Isrc/soc/qualcomm/x1p42100/include
 CPPFLAGS_common += -Isrc/soc/qualcomm/common/include
 
 ################################################################################
+# look for QC blobs if QC SoC blobs are only available in upstream else ignore
+ifeq ($(CONFIG_QC_BLOBS_UPSTREAM),y)
 ifeq ($(CONFIG_USE_QC_BLOBS),y)
 # TODO: Upload X1P42100 SoC blobs
-X1P42100_BLOB := $(top)/3rdparty/qc_blobs/sc7280
+X1P42100_BLOB := $(top)/3rdparty/qc_blobs/x1p42100
 
 ifeq ($(CONFIG_QC_SDI_ENABLE),y)
 BL31_MAKEARGS += QTI_SDI_BUILD=1
@@ -187,6 +189,7 @@ $(GSI_FW_CBFS)-type := raw
 $(GSI_FW_CBFS)-compression := $(CBFS_COMPRESS_FLAG)
 cbfs-files-y += $(GSI_FW_CBFS)
 
-endif
+endif # ifeq ($(CONFIG_USE_QC_BLOBS),y)
 
-endif
+endif # ifeq ($(CONFIG_QC_BLOBS_UPSTREAM),y)
+endif # ifeq ($(CONFIG_SOC_QUALCOMM_X1P42100),y)