diff --git a/Kbuild b/Kbuild
index 11eed090633c..5440b8ac1d24 100755
--- a/Kbuild
+++ b/Kbuild
@@ -129,10 +129,6 @@ ifeq ($(KERNEL_BUILD), 0)
                 CONFIG_LINUX_QCMBR :=y
         endif
 
-        ifeq ($(CONFIG_CNSS_EOS),y)
-        CONFIG_FEATURE_BMI_2 :=y
-        endif
-
 	CONFIG_MPC_UT_FRAMEWORK := y
 
 	#Flag to enable offload packets feature
@@ -675,11 +671,7 @@ BMI_INC := -I$(WLAN_ROOT)/$(BMI_DIR)/inc
 
 BMI_OBJS := $(BMI_DIR)/src/bmi.o \
             $(BMI_DIR)/src/ol_fw.o
-ifeq ($(CONFIG_FEATURE_BMI_2), y)
-BMI_OBJS += $(BMI_DIR)/src/bmi_2.o
-else
 BMI_OBJS += $(BMI_DIR)/src/bmi_1.o
-endif
 
 ########### WMI ###########
 WMI_ROOT_DIR := wmi
@@ -1015,10 +1007,6 @@ CDEFINES += -DFEATURE_NAPI_DEBUG
 endif
 endif
 
-ifeq ($(CONFIG_FEATURE_BMI_2), y)
-CDEFINES += -DFEATURE_BMI_2
-endif
-
 ifeq (y,$(findstring y,$(CONFIG_ARCH_MSM) $(CONFIG_ARCH_QCOM)))
 CDEFINES += -DMSM_PLATFORM
 endif
diff --git a/core/bmi/src/bmi.c b/core/bmi/src/bmi.c
index 5752ccc0d6e9..fc9969d7d993 100644
--- a/core/bmi/src/bmi.c
+++ b/core/bmi/src/bmi.c
@@ -30,38 +30,6 @@
 
 /* APIs visible to the driver */
 
-/* BMI_1 refers QCA6174 target; the ADDR is AXI addr */
-#define BMI_1_TEST_ADDR	(0xa0000)
-/* BMI_2 ; */
-#define BMI_2_TEST_ADDR	(0x6E0000)
-/* Enable BMI_TEST COMMANDs; The Value 0x09 is randomly choosen */
-#define BMI_TEST_ENABLE (0x09)
-
-#ifndef CONFIG_CNSS
-#define SHOULD_RUN_BMI_TEST_COMMANDS false
-#else
-#define SHOULD_RUN_BMI_TEST_COMMANDS (BMI_TEST_ENABLE == cnss_get_bmi_setup())
-#endif
-
-static QDF_STATUS
-bmi_command_test(uint32_t command, uint32_t address, uint8_t *data,
-				uint32_t length, struct ol_context *ol_ctx)
-{
-	switch (command) {
-	case BMI_NO_COMMAND:
-		return bmi_no_command(ol_ctx);
-	case BMI_WRITE_MEMORY:
-		return bmi_write_memory(address, data, length, ol_ctx);
-	case BMI_READ_MEMORY:
-		return bmi_read_memory(address, data, length, ol_ctx);
-	case BMI_EXECUTE:
-		return bmi_execute(address, (uint32_t *)data, ol_ctx);
-	default:
-		break;
-	}
-	return QDF_STATUS_SUCCESS;
-}
-
 QDF_STATUS bmi_init(struct ol_context *ol_ctx)
 {
 	struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx);
@@ -214,43 +182,6 @@ bmi_get_target_info(struct bmi_target_info *targ_info,
 	return QDF_STATUS_SUCCESS;
 }
 
-#ifdef FEATURE_BMI_2
-static inline uint32_t bmi_get_test_addr(void)
-{
-	return BMI_2_TEST_ADDR;
-}
-#else
-static inline uint32_t bmi_get_test_addr(void)
-{
-	return BMI_1_TEST_ADDR;
-}
-#endif
-
-/**
- * run_bmi_test() - run some bmi tests
- * @ol_ctx: bmi context
- *
- */
-static void run_bmi_test(struct ol_context *ol_ctx)
-{
-	uint8_t data[10], out[10];
-	uint32_t address;
-	int32_t ret;
-
-	ret = snprintf(data, 10, "ABCDEFGHI");
-	BMI_DBG("ret:%d writing data:%s\n", ret, data);
-	address = bmi_get_test_addr();
-
-	if (bmi_init(ol_ctx) != QDF_STATUS_SUCCESS) {
-		BMI_WARN("BMI_INIT Failed; No Memory!");
-		return;
-	}
-	bmi_command_test(BMI_NO_COMMAND, address, data, 9, ol_ctx);
-	bmi_command_test(BMI_WRITE_MEMORY, address, data, 9, ol_ctx);
-	bmi_command_test(BMI_READ_MEMORY, address, out, 9, ol_ctx);
-	BMI_DBG("Output:%s", out);
-}
-
 QDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx)
 {
 	struct hif_opaque_softc *scn = ol_ctx->scn;
@@ -264,8 +195,6 @@ QDF_STATUS bmi_download_firmware(struct ol_context *ol_ctx)
 		return QDF_STATUS_NOT_INITIALIZED;
 	}
 
-	if (SHOULD_RUN_BMI_TEST_COMMANDS)
-		run_bmi_test(ol_ctx);
 	return bmi_firmware_download(ol_ctx);
 }
 
diff --git a/core/bmi/src/bmi_2.c b/core/bmi/src/bmi_2.c
deleted file mode 100644
index 59c6dd605461..000000000000
--- a/core/bmi/src/bmi_2.c
+++ /dev/null
@@ -1,490 +0,0 @@
-/*
- * copyright (c) 2014-2016 The Linux Foundation. All rights reserved.
- *
- * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
- *
- *
- * Permission to use, copy, modify, and/or distribute this software for
- * any purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * This file was originally distributed by Qualcomm Atheros, Inc.
- * under proprietary terms before Copyright ownership was assigned
- * to the Linux Foundation.
- */
-#include "i_bmi.h"
-#include "cds_api.h"
-/* This need to defined in firmware interface files.
- * Defining here to address compilation issues.
- * Will be deleted once firmware interface files for
- * target are merged
- */
-#define BMI_LOAD_IMAGE              18
-
-QDF_STATUS
-bmi_no_command(struct ol_context *ol_ctx)
-{
-	struct hif_opaque_softc *scn = ol_ctx->scn;
-	uint32_t cid;
-	int status;
-	uint32_t length;
-	uint8_t ret = 0;
-	struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx);
-	uint8_t *bmi_cmd_buff = info->bmi_cmd_buff;
-	uint8_t *bmi_rsp_buff = info->bmi_rsp_buff;
-	qdf_dma_addr_t cmd = info->bmi_cmd_da;
-	qdf_dma_addr_t rsp = info->bmi_rsp_da;
-
-	if (info->bmi_done) {
-		BMI_ERR("Command disallowed: BMI DONE ALREADY");
-		return QDF_STATUS_E_PERM;
-	}
-
-	if (!bmi_cmd_buff || !bmi_rsp_buff) {
-		BMI_ERR("No Memory Allocated for BMI CMD/RSP Buffer");
-		return QDF_STATUS_NOT_INITIALIZED;
-	}
-	cid = BMI_NO_COMMAND;
-
-	qdf_mem_copy(bmi_cmd_buff, &cid, sizeof(cid));
-	length = sizeof(ret);
-
-	status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, sizeof(cid),
-			bmi_rsp_buff, &length, BMI_EXCHANGE_TIMEOUT_MS);
-
-	if (status) {
-		BMI_ERR("Failed to write bmi no command status:%d", status);
-		return QDF_STATUS_E_FAILURE;
-	}
-
-	qdf_mem_copy(&ret, bmi_rsp_buff, length);
-	if (ret != 0) {
-		BMI_ERR("bmi no command response error ret 0x%x", ret);
-		return QDF_STATUS_E_FAILURE;
-	}
-	return QDF_STATUS_SUCCESS;
-}
-
-QDF_STATUS
-bmi_done_local(struct ol_context *ol_ctx)
-{
-	struct hif_opaque_softc *scn = ol_ctx->scn;
-	uint32_t cid;
-	int status;
-	uint32_t length;
-	uint8_t ret = 0;
-	struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx);
-	uint8_t *bmi_cmd_buff = info->bmi_cmd_buff;
-	uint8_t *bmi_rsp_buff = info->bmi_rsp_buff;
-	qdf_device_t qdf_dev = ol_ctx->qdf_dev;
-	qdf_dma_addr_t cmd = info->bmi_cmd_da;
-	qdf_dma_addr_t rsp = info->bmi_rsp_da;
-
-	if (info->bmi_done) {
-		BMI_ERR("Command disallowed");
-		return QDF_STATUS_E_PERM;
-	}
-
-	if (!bmi_cmd_buff || !bmi_rsp_buff) {
-		BMI_ERR("No Memory Allocated for BMI CMD/RSP Buffer");
-		return QDF_STATUS_NOT_INITIALIZED;
-	}
-
-	if (!qdf_dev->dev) {
-		BMI_ERR("%s Invalid Device pointer", __func__);
-		return QDF_STATUS_NOT_INITIALIZED;
-	}
-
-	cid = BMI_DONE;
-
-	qdf_mem_copy(bmi_cmd_buff, &cid, sizeof(cid));
-	length = sizeof(ret);
-
-	status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, sizeof(cid),
-		   bmi_rsp_buff, &length, BMI_EXCHANGE_TIMEOUT_MS);
-
-	if (status) {
-		BMI_ERR("Failed to close BMI on target status:%d", status);
-		return QDF_STATUS_E_FAILURE;
-	}
-	qdf_mem_copy(&ret, bmi_rsp_buff, length);
-
-	if (ret != 0) {
-		BMI_ERR("BMI DONE response failed:%d", ret);
-		return QDF_STATUS_E_FAILURE;
-	}
-
-	if (info->bmi_cmd_buff) {
-		qdf_mem_free_consistent(qdf_dev, qdf_dev->dev,
-					MAX_BMI_CMDBUF_SZ,
-				    info->bmi_cmd_buff, info->bmi_cmd_da, 0);
-		info->bmi_cmd_buff = NULL;
-		info->bmi_cmd_da = 0;
-	}
-
-	if (info->bmi_rsp_buff) {
-		qdf_mem_free_consistent(qdf_dev, qdf_dev->dev,
-					MAX_BMI_CMDBUF_SZ,
-				    info->bmi_rsp_buff, info->bmi_rsp_da, 0);
-		info->bmi_rsp_buff = NULL;
-		info->bmi_rsp_da = 0;
-	}
-
-	return QDF_STATUS_SUCCESS;
-}
-
-QDF_STATUS bmi_write_memory(uint32_t address, uint8_t *buffer, uint32_t length,
-			    struct ol_context *ol_ctx)
-{
-	uint32_t cid;
-	int status;
-	uint32_t rsp_len;
-	uint8_t ret = 0;
-	uint32_t offset;
-	uint32_t remaining, txlen;
-	const uint32_t header = sizeof(cid) + sizeof(address) + sizeof(length);
-	uint8_t aligned_buffer[BMI_DATASZ_MAX];
-	uint8_t *src;
-	struct hif_opaque_softc *scn = ol_ctx->scn;
-	struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx);
-	uint8_t *bmi_cmd_buff = info->bmi_cmd_buff;
-	uint8_t *bmi_rsp_buff = info->bmi_rsp_buff;
-	qdf_dma_addr_t cmd = info->bmi_cmd_da;
-	qdf_dma_addr_t rsp = info->bmi_rsp_da;
-
-	if (info->bmi_done) {
-		BMI_ERR("Command disallowed");
-		return QDF_STATUS_E_PERM;
-	}
-
-	if (!bmi_cmd_buff || !bmi_rsp_buff) {
-		BMI_ERR("BMI Initialization is not happened");
-		return QDF_STATUS_NOT_INITIALIZED;
-	}
-
-	bmi_assert(BMI_COMMAND_FITS(BMI_DATASZ_MAX + header));
-	qdf_mem_set(bmi_cmd_buff, 0, BMI_DATASZ_MAX + header);
-
-	cid = BMI_WRITE_MEMORY;
-	rsp_len = sizeof(ret);
-
-	remaining = length;
-	while (remaining) {
-		src = &buffer[length - remaining];
-		if (remaining < (BMI_DATASZ_MAX - header)) {
-			if (remaining & 3) {
-				/* align it with 4 bytes */
-				remaining = remaining + (4 - (remaining & 3));
-				memcpy(aligned_buffer, src, remaining);
-				src = aligned_buffer;
-			}
-			txlen = remaining;
-		} else {
-			txlen = (BMI_DATASZ_MAX - header);
-		}
-		offset = 0;
-		qdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid));
-		offset += sizeof(cid);
-		qdf_mem_copy(&(bmi_cmd_buff[offset]), &address,
-						sizeof(address));
-		offset += sizeof(address);
-		qdf_mem_copy(&(bmi_cmd_buff[offset]), &txlen, sizeof(txlen));
-		offset += sizeof(txlen);
-		qdf_mem_copy(&(bmi_cmd_buff[offset]), src, txlen);
-		offset += txlen;
-		status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff,
-						offset, bmi_rsp_buff, &rsp_len,
-						BMI_EXCHANGE_TIMEOUT_MS);
-		if (status) {
-			BMI_ERR("BMI Write Memory Failed status:%d", status);
-			return QDF_STATUS_E_FAILURE;
-		}
-		qdf_mem_copy(&ret, bmi_rsp_buff, rsp_len);
-		if (ret != 0) {
-			BMI_ERR("BMI Write memory response fail: %x", ret);
-			return QDF_STATUS_E_FAILURE;
-		}
-		remaining -= txlen; address += txlen;
-	}
-
-	return QDF_STATUS_SUCCESS;
-}
-
-QDF_STATUS
-bmi_read_memory(uint32_t address, uint8_t *buffer,
-		uint32_t length, struct ol_context *ol_ctx)
-{
-	struct hif_opaque_softc *scn = ol_ctx->scn;
-	uint32_t cid;
-	int status;
-	uint8_t ret = 0;
-	uint32_t offset;
-	uint32_t remaining, rxlen, rsp_len, total_len;
-	struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx);
-	uint8_t *bmi_cmd_buff = info->bmi_cmd_buff;
-	/* note we reuse the same buffer to receive on */
-	uint8_t *bmi_rsp_buff = info->bmi_rsp_buff;
-	uint32_t size = sizeof(cid) + sizeof(address) + sizeof(length);
-	qdf_dma_addr_t cmd = info->bmi_cmd_da;
-	qdf_dma_addr_t rsp = info->bmi_rsp_da;
-
-	if (info->bmi_done) {
-		BMI_ERR("Command disallowed");
-		return QDF_STATUS_E_PERM;
-	}
-	if (!bmi_cmd_buff || !bmi_rsp_buff) {
-		BMI_ERR("BMI Initialization is not done");
-		return QDF_STATUS_NOT_INITIALIZED;
-	}
-
-	bmi_assert(BMI_COMMAND_FITS(BMI_DATASZ_MAX + size));
-	qdf_mem_set(bmi_cmd_buff, 0, BMI_DATASZ_MAX + size);
-	qdf_mem_set(bmi_rsp_buff, 0, BMI_DATASZ_MAX + size);
-
-	cid = BMI_READ_MEMORY;
-	rsp_len = sizeof(ret);
-	remaining = length;
-
-	while (remaining) {
-		rxlen = (remaining < BMI_DATASZ_MAX - rsp_len) ? remaining :
-						(BMI_DATASZ_MAX - rsp_len);
-		offset = 0;
-		qdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid));
-		offset += sizeof(cid);
-		qdf_mem_copy(&(bmi_cmd_buff[offset]), &address,
-						sizeof(address));
-		offset += sizeof(address);
-		qdf_mem_copy(&(bmi_cmd_buff[offset]), &rxlen, sizeof(rxlen));
-		offset += sizeof(length);
-
-		total_len = rxlen + rsp_len;
-
-		status = hif_exchange_bmi_msg(scn, cmd, rsp,
-					   bmi_cmd_buff,
-					   offset,
-					   bmi_rsp_buff,
-					   &total_len,
-					   BMI_EXCHANGE_TIMEOUT_MS);
-
-		if (status) {
-			BMI_ERR("BMI Read memory failed status:%d", status);
-			return QDF_STATUS_E_FAILURE;
-		}
-
-		qdf_mem_copy(&ret, bmi_rsp_buff, rsp_len);
-
-		if (ret != 0) {
-			BMI_ERR("bmi read memory response fail %x", ret);
-			return QDF_STATUS_E_FAILURE;
-		}
-
-		qdf_mem_copy(&buffer[length - remaining],
-				(uint8_t *)bmi_rsp_buff	+ rsp_len, rxlen);
-		remaining -= rxlen; address += rxlen;
-	}
-
-	return QDF_STATUS_SUCCESS;
-}
-
-QDF_STATUS
-bmi_execute(uint32_t address, uint32_t *param, struct ol_context *ol_ctx)
-{
-	struct hif_opaque_softc *scn = ol_ctx->scn;
-	uint32_t cid;
-	int status;
-	uint32_t length;
-	uint8_t ret = 0;
-	struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx);
-	uint8_t *bmi_cmd_buff = info->bmi_cmd_buff;
-	uint8_t *bmi_rsp_buff = info->bmi_rsp_buff;
-	qdf_dma_addr_t cmd = info->bmi_cmd_da;
-	qdf_dma_addr_t rsp = info->bmi_rsp_da;
-
-	if (info->bmi_done) {
-		BMI_ERR("Command disallowed");
-		return QDF_STATUS_E_PERM;
-	}
-
-	if (!bmi_cmd_buff || !bmi_rsp_buff) {
-		BMI_ERR("No Memory Allocated for bmi buffers");
-		return QDF_STATUS_NOT_INITIALIZED;
-	}
-
-	cid = BMI_EXECUTE;
-
-	qdf_mem_copy(bmi_cmd_buff, &cid, sizeof(cid));
-	length = sizeof(ret);
-
-	status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, sizeof(cid),
-		   bmi_rsp_buff, &length, BMI_EXCHANGE_TIMEOUT_MS);
-
-	if (status) {
-		BMI_ERR("Failed to do BMI_EXECUTE status:%d", status);
-		return QDF_STATUS_E_FAILURE;
-	}
-
-	qdf_mem_copy(&ret, bmi_rsp_buff, length);
-
-	if (ret != 0) {
-		BMI_ERR("%s: ret 0x%x", __func__, ret);
-		return QDF_STATUS_E_FAILURE;
-	}
-	return QDF_STATUS_SUCCESS;
-}
-
-static QDF_STATUS
-bmi_load_image(dma_addr_t address,
-		uint32_t size, struct ol_context *ol_ctx)
-{
-	uint32_t cid;
-	QDF_STATUS status;
-	uint32_t offset;
-	uint32_t length;
-	uint8_t ret = 0;
-	struct hif_opaque_softc *scn = ol_ctx->scn;
-	struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx);
-	uint8_t *bmi_cmd_buff = info->bmi_cmd_buff;
-	uint8_t *bmi_rsp_buff = info->bmi_rsp_buff;
-	qdf_dma_addr_t cmd = info->bmi_cmd_da;
-	qdf_dma_addr_t rsp = info->bmi_rsp_da;
-
-	uint32_t addr_h, addr_l;
-
-	if (info->bmi_done) {
-		BMI_ERR("Command disallowed");
-		return QDF_STATUS_E_PERM;
-	}
-
-	if (!bmi_cmd_buff || !bmi_rsp_buff) {
-		BMI_ERR("No Memory Allocated for BMI CMD/RSP Buffer");
-		return QDF_STATUS_NOT_INITIALIZED;
-	}
-
-	bmi_assert(BMI_COMMAND_FITS(sizeof(cid) + sizeof(address)));
-	qdf_mem_set(bmi_cmd_buff, 0, sizeof(cid) + sizeof(address));
-
-
-	BMI_DBG("%s: Enter device: 0x%p, size %d", __func__, scn, size);
-
-	cid = BMI_LOAD_IMAGE;
-
-	offset = 0;
-	qdf_mem_copy(&(bmi_cmd_buff[offset]), &cid, sizeof(cid));
-	offset += sizeof(cid);
-	addr_l = address & 0xffffffff;
-	addr_h = 0x00;
-	qdf_mem_copy(&(bmi_cmd_buff[offset]), &addr_l, sizeof(addr_l));
-	offset += sizeof(addr_l);
-	qdf_mem_copy(&(bmi_cmd_buff[offset]), &addr_h, sizeof(addr_h));
-	offset += sizeof(addr_h);
-	qdf_mem_copy(&(bmi_cmd_buff[offset]), &size, sizeof(size));
-	offset += sizeof(size);
-	length = sizeof(ret);
-
-	status = hif_exchange_bmi_msg(scn, cmd, rsp, bmi_cmd_buff, offset,
-		   bmi_rsp_buff, &length, BMI_EXCHANGE_TIMEOUT_MS);
-
-	if (status) {
-		BMI_ERR("BMI Load Image Failed; status:%d", status);
-		return QDF_STATUS_E_FAILURE;
-	}
-
-	qdf_mem_copy(&ret, bmi_rsp_buff, length);
-	if (ret != 0) {
-		BMI_ERR("%s: ret 0x%x", __func__, ret);
-		return QDF_STATUS_E_FAILURE;
-	}
-	return QDF_STATUS_SUCCESS;
-}
-
-static QDF_STATUS bmi_enable(struct ol_context *ol_ctx)
-{
-	struct hif_opaque_softc *scn = ol_ctx->scn;
-	struct bmi_target_info targ_info;
-	struct image_desc_info image_desc_info;
-	QDF_STATUS status;
-	struct hif_target_info *tgt_info;
-	struct bmi_info *info = GET_BMI_CONTEXT(ol_ctx);
-
-	if (!scn) {
-		BMI_ERR("Invalid scn context");
-		bmi_assert(0);
-		return QDF_STATUS_NOT_INITIALIZED;
-	}
-
-	tgt_info = hif_get_target_info_handle(scn);
-
-	if (info->bmi_cmd_buff == NULL || info->bmi_rsp_buff == NULL) {
-		BMI_ERR("bmi_open failed!");
-		return QDF_STATUS_NOT_INITIALIZED;
-	}
-
-	status = bmi_get_target_info(&targ_info, ol_ctx);
-	if (status != QDF_STATUS_SUCCESS)
-			return status;
-
-	BMI_DBG("%s: target type 0x%x, target ver 0x%x", __func__,
-	       targ_info.target_type, targ_info.target_ver);
-
-	tgt_info->target_type = targ_info.target_type;
-	tgt_info->target_version = targ_info.target_ver;
-
-	if (cnss_get_fw_image(&image_desc_info) != 0) {
-		BMI_ERR("Failed to get fw image");
-		return QDF_STATUS_E_FAILURE;
-	}
-
-	status = bmi_load_image(image_desc_info.bdata_addr,
-				image_desc_info.bdata_size,
-				ol_ctx);
-	if (status != QDF_STATUS_SUCCESS) {
-		BMI_ERR("Load board data failed! status:%d", status);
-		return status;
-	}
-
-	status = bmi_load_image(image_desc_info.fw_addr,
-				image_desc_info.fw_size,
-				ol_ctx);
-	if (status != QDF_STATUS_SUCCESS)
-		BMI_ERR("Load fw image failed! status:%d", status);
-
-	return status;
-}
-
-QDF_STATUS bmi_firmware_download(struct ol_context *ol_ctx)
-{
-	QDF_STATUS status;
-
-	if (NO_BMI)
-		return QDF_STATUS_SUCCESS;
-
-	status = bmi_init(ol_ctx);
-	if (status != QDF_STATUS_SUCCESS) {
-		BMI_ERR("BMI_INIT Failed status:%d", status);
-		goto end;
-	}
-
-	status = bmi_enable(ol_ctx);
-	if (status != QDF_STATUS_SUCCESS) {
-		BMI_ERR("BMI_ENABLE failed status:%d\n", status);
-		goto err_bmi_enable;
-	}
-
-	return status;
-err_bmi_enable:
-	bmi_cleanup(ol_ctx);
-end:
-	return status;
-}
diff --git a/core/bmi/src/ol_fw.c b/core/bmi/src/ol_fw.c
index 2950a69ebd50..3314d75c7e36 100644
--- a/core/bmi/src/ol_fw.c
+++ b/core/bmi/src/ol_fw.c
@@ -1264,9 +1264,7 @@ QDF_STATUS ol_download_firmware(struct ol_context *ol_ctx)
 		/* Execute the OTP code only if entry found and downloaded */
 		if (status == EOK) {
 			param = 0;
-#ifndef FEATURE_BMI_2
 			bmi_execute(address, &param, ol_ctx);
-#endif
 		} else if (status < 0) {
 			return status;
 		}
@@ -1275,9 +1273,7 @@ QDF_STATUS ol_download_firmware(struct ol_context *ol_ctx)
 	if (ol_transfer_bin_file(ol_ctx, ATH_SETUP_FILE,
 		BMI_SEGMENTED_WRITE_ADDR, true) == EOK) {
 		param = 0;
-#ifndef FEATURE_BMI_2
 		bmi_execute(address, &param, ol_ctx);
-#endif
 	}
 
 	/* Download Target firmware