diff --git a/Makefile b/Makefile
index 623631679..e8e76f6b6 100644
--- a/Makefile
+++ b/Makefile
@@ -103,12 +103,6 @@ else ifeq ($(BOARD), kbl-nuc-i7)
   override BOARD := nuc7i7dnb
 endif
 
-ifneq (,$(filter $(BOARD),apl-mrb))
-	FIRMWARE ?= sbl
-else
-	FIRMWARE ?= uefi
-endif
-
 SCENARIO ?= industry
 
 O ?= build
@@ -123,7 +117,7 @@ HV_CFG_LOG = $(HV_OUT)/cfg.log
 VM_CONFIGS_DIR = $(T)/misc/vm_configs
 DEFCONFIG_FILE = scenarios/$(SCENARIO)/$(BOARD)/$(BOARD).config
 
-export TOOLS_OUT BOARD SCENARIO FIRMWARE RELEASE
+export TOOLS_OUT BOARD SCENARIO RELEASE
 
 .PHONY: all hypervisor devicemodel tools doc
 all: hypervisor devicemodel tools
@@ -133,18 +127,18 @@ include $(T)/hypervisor/scripts/makefile/cfg_update.mk
 
 #help functions to build acrn and install acrn/acrn symbols
 define build_acrn
-	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-$(1)/$(2) BOARD=$(2) FIRMWARE=$(1) SCENARIO=$(3) RELEASE=$(RELEASE) clean
-	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-$(1)/$(2) BOARD=$(2) FIRMWARE=$(1) SCENARIO=$(3) RELEASE=$(RELEASE) defconfig
-	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-$(1)/$(2) BOARD=$(2) FIRMWARE=$(1) SCENARIO=$(3) RELEASE=$(RELEASE) oldconfig
-	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-$(1)/$(2) BOARD=$(2) FIRMWARE=$(1) SCENARIO=$(3) RELEASE=$(RELEASE)
+	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)/$(1) BOARD=$(1) SCENARIO=$(2) RELEASE=$(RELEASE) clean
+	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)/$(1) BOARD=$(1) SCENARIO=$(2) RELEASE=$(RELEASE) defconfig
+	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)/$(1) BOARD=$(1) SCENARIO=$(2) RELEASE=$(RELEASE) oldconfig
+	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)/$(1) BOARD=$(1) SCENARIO=$(2) RELEASE=$(RELEASE)
 endef
 
 define install_acrn
-	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-$(1)/$(2) BOARD=$(2) FIRMWARE=$(1) SCENARIO=$(3) RELEASE=$(RELEASE) install
+	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)/$(1) BOARD=$(1) SCENARIO=$(2) RELEASE=$(RELEASE) install
 endef
 
 define install_acrn_debug
-	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-$(1)/$(2) BOARD=$(2) FIRMWARE=$(1) SCENARIO=$(3) RELEASE=$(RELEASE) install-debug
+	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)/$(1) BOARD=$(1) SCENARIO=$(2) RELEASE=$(RELEASE) install-debug
 endef
 
 hypervisor:
@@ -200,34 +194,34 @@ clean:
 install: hypervisor-install devicemodel-install tools-install
 
 hypervisor-install:
-	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) SCENARIO=$(SCENARIO) RELEASE=$(RELEASE) install
+	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) SCENARIO=$(SCENARIO) RELEASE=$(RELEASE) install
 
 hypervisor-install-debug:
-	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) SCENARIO=$(SCENARIO) RELEASE=$(RELEASE) install-debug
+	$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) SCENARIO=$(SCENARIO) RELEASE=$(RELEASE) install-debug
 
-kbl-nuc-i7-uefi-industry:
-	$(call build_acrn,uefi,nuc7i7dnb,industry)
-apl-up2-uefi-hybrid:
-	$(call build_acrn,uefi,apl-up2,hybrid)
+kbl-nuc-i7-industry:
+	$(call build_acrn,nuc7i7dnb,industry)
+apl-up2-hybrid:
+	$(call build_acrn,apl-up2,hybrid)
 
-sbl-hypervisor: kbl-nuc-i7-uefi-industry \
-                apl-up2-uefi-hybrid
+sbl-hypervisor: kbl-nuc-i7-industry \
+                apl-up2-hybrid
 
-kbl-nuc-i7-uefi-industry-install:
-	$(call install_acrn,uefi,nuc7i7dnb,industry)
-apl-up2-uefi-hybrid-install:
-	$(call install_acrn,uefi,apl-up2,hybrid)
+kbl-nuc-i7-industry-install:
+	$(call install_acrn,nuc7i7dnb,industry)
+apl-up2-hybrid-install:
+	$(call install_acrn,apl-up2,hybrid)
 
-sbl-hypervisor-install: kbl-nuc-i7-uefi-industry-install \
-                        apl-up2-uefi-hybrid-install
+sbl-hypervisor-install: kbl-nuc-i7-industry-install \
+                        apl-up2-hybrid-install
 
-kbl-nuc-i7-uefi-industry-install-debug:
-	$(call install_acrn_debug,uefi,nuc7i7dnb,industry)
-apl-up2-uefi-hybrid-install-debug:
-	$(call install_acrn_debug,uefi,apl-up2,hybrid)
+kbl-nuc-i7-industry-install-debug:
+	$(call install_acrn_debug,nuc7i7dnb,industry)
+apl-up2-hybrid-install-debug:
+	$(call install_acrn_debug,apl-up2,hybrid)
 
-sbl-hypervisor-install-debug: kbl-nuc-i7-uefi-industry-install-debug \
-			      apl-up2-uefi-hybrid-install-debug
+sbl-hypervisor-install-debug: kbl-nuc-i7-industry-install-debug \
+			      apl-up2-hybrid-install-debug
 
 devicemodel-install:
 	$(MAKE) -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) install
diff --git a/hypervisor/Makefile b/hypervisor/Makefile
index bc1cf33fa..0ebfc21d9 100644
--- a/hypervisor/Makefile
+++ b/hypervisor/Makefile
@@ -354,9 +354,7 @@ SYS_INIT_C_OBJS := $(patsubst %.c,$(HV_OBJDIR)/%.o,$(SYS_INIT_C_SRCS))
 ifneq ($(CONFIG_RELEASE),y)
 CFLAGS += -DHV_DEBUG -DPROFILING_ON -fno-omit-frame-pointer
 endif
-ifneq ($(FIRMWARE),uefi)
 CFLAGS += -DCONFIG_LAST_LEVEL_EPT_AT_BOOT
-endif
 
 MODULES += $(LIB_MOD)
 MODULES += $(BOOT_MOD)
@@ -385,15 +383,15 @@ PRE_BUILD_DIR := ../misc/hv_prebuild
 all: pre_build $(HV_OBJDIR)/$(HV_FILE).32.out $(HV_OBJDIR)/$(HV_FILE).bin
 
 install: $(HV_OBJDIR)/$(HV_FILE).32.out
-	install -D $(HV_OBJDIR)/$(HV_FILE).32.out $(DESTDIR)$(libdir)/acrn/$(HV_FILE).$(BOARD).$(FIRMWARE).$(SCENARIO).32.out
-	install -D $(HV_OBJDIR)/$(HV_FILE).bin $(DESTDIR)$(libdir)/acrn/$(HV_FILE).$(BOARD).$(FIRMWARE).$(SCENARIO).bin
+	install -D $(HV_OBJDIR)/$(HV_FILE).32.out $(DESTDIR)$(libdir)/acrn/$(HV_FILE).$(BOARD).$(SCENARIO).32.out
+	install -D $(HV_OBJDIR)/$(HV_FILE).bin $(DESTDIR)$(libdir)/acrn/$(HV_FILE).$(BOARD).$(SCENARIO).bin
 	@if [ -e "$(HV_OBJDIR)/acpi" ];then \
 		install -D $(HV_OBJDIR)/acpi/*.bin -t $(DESTDIR)$(libdir)/acrn/acpi/; \
 	fi
 
 install-debug: $(HV_OBJDIR)/$(HV_FILE).map $(HV_OBJDIR)/$(HV_FILE).out
-	install -D $(HV_OBJDIR)/$(HV_FILE).out $(DESTDIR)$(libdir)/acrn/$(HV_FILE).$(BOARD).$(FIRMWARE).$(SCENARIO).out
-	install -D $(HV_OBJDIR)/$(HV_FILE).map $(DESTDIR)$(libdir)/acrn/$(HV_FILE).$(BOARD).$(FIRMWARE).$(SCENARIO).map
+	install -D $(HV_OBJDIR)/$(HV_FILE).out $(DESTDIR)$(libdir)/acrn/$(HV_FILE).$(BOARD).$(SCENARIO).out
+	install -D $(HV_OBJDIR)/$(HV_FILE).map $(DESTDIR)$(libdir)/acrn/$(HV_FILE).$(BOARD).$(SCENARIO).map
 
 .PHONY: pre_build
 pre_build: $(HV_OBJDIR)/$(HV_CONFIG_H)