diff --git a/board/qualcomm/debug-shikra-iqs-evk.config b/board/qualcomm/debug-shikra-evk.config
similarity index 100%
rename from board/qualcomm/debug-shikra-iqs-evk.config
rename to board/qualcomm/debug-shikra-evk.config
diff --git a/configs/qcom_shikra_cqs_defconfig b/configs/qcom_shikra_cqs_defconfig
new file mode 100644
index 000000000000..4a6f85fb860b
--- /dev/null
+++ b/configs/qcom_shikra_cqs_defconfig
@@ -0,0 +1,32 @@
+# Configuration for building U-Boot in Shikra CQS EVK
+
+#include "qcom_defconfig"
+#include "board/qualcomm/debug-shikra-evk.config"
+
+# Otherwise buildman thinks this isn't an ARM platform
+CONFIG_ARM=y
+
+# CONFIG_OF_UPSTREAM is not set
+
+CONFIG_DEFAULT_DEVICE_TREE="shikra-cqs-evk"
+
+# Address where U-Boot will be loaded
+CONFIG_TEXT_BASE=0x9f400000
+CONFIG_REMAKE_ELF=y
+
+CONFIG_FASTBOOT_BUF_ADDR=0xc5000000
+
+CONFIG_WATCHDOG_AUTOSTART=y
+
+# Shikra has eMMC only, not UFS/SCSI - override qcom_defconfig settings
+CONFIG_FASTBOOT_FLASH_BLOCK_INTERFACE_NAME="mmc"
+CONFIG_FASTBOOT_FLASH_BLOCK_DEVICE_ID=0
+
+# CONFIG_SCSI is not set
+
+# Environment stored in eMMC logfs partition
+CONFIG_ENV_IS_IN_MMC=y
+CONFIG_ENV_MMC_USE_SW_PARTITION=y
+CONFIG_ENV_MMC_SW_PARTITION="logfs"
+CONFIG_ENV_OFFSET=0x0
+CONFIG_ENV_SIZE=0x4000
diff --git a/configs/qcom_shikra_defconfig b/configs/qcom_shikra_iqs_defconfig
similarity index 93%
rename from configs/qcom_shikra_defconfig
rename to configs/qcom_shikra_iqs_defconfig
index fe102ee9a979..403a5e504b08 100644
--- a/configs/qcom_shikra_defconfig
+++ b/configs/qcom_shikra_iqs_defconfig
@@ -1,7 +1,7 @@
 # Configuration for building U-Boot in Shikra IQS EVK
 
 #include "qcom_defconfig"
-#include "board/qualcomm/debug-shikra-iqs-evk.config"
+#include "board/qualcomm/debug-shikra-evk.config"
 
 # Otherwise buildman thinks this isn't an ARM platform
 CONFIG_ARM=y