From 5ca26d3b82fe522b9b5c7bf93ff60e165c5db440 Mon Sep 17 00:00:00 2001
From: wenlingz <wenling.zhang@intel.com>
Date: Tue, 29 Oct 2019 16:19:53 +0800
Subject: [PATCH] Modify KBL-NUC/SDC for default build remove acrn.efi and
 modify KBL-NUC/SDC for default build Tracked-On: #3953 Signed-off-by:
 wenlingz <wenling.zhang@intel.com>

---
 Makefile               |  8 ++++----
 misc/efi-stub/Makefile | 11 -----------
 2 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 6316cdac5..7633d6a1e 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # global helper variables
 T := $(CURDIR)
 
-BOARD ?= apl-nuc
+BOARD ?= kbl-nuc-i7
 
 ifneq (,$(filter $(BOARD),apl-mrb))
 	FIRMWARE ?= sbl
@@ -131,7 +131,7 @@ apl-mrb-sbl-sdc:
 apl-up2-sbl-sdc:
 	$(call build_acrn,sbl,apl-up2,CONFIG_SDC,sdc)
 kbl-nuc-i7-uefi-industry:
-	$(call build_acrn,uefi,kbl-nuc-i7,CONFIG_INDUSTRY,industry)
+	$(call build_acrn,uefi,nuc7i7dnb,CONFIG_INDUSTRY,industry)
 apl-up2-uefi-hybrid:
 	$(call build_acrn,uefi,apl-up2,CONFIG_HYBRID,hybrid)
 
@@ -145,7 +145,7 @@ apl-mrb-sbl-sdc-install:
 apl-up2-sbl-sdc-install:
 	$(call install_acrn,sbl,apl-up2,sdc)
 kbl-nuc-i7-uefi-industry-install:
-	$(call install_acrn,uefi,kbl-nuc-i7,industry)
+	$(call install_acrn,uefi,nuc7i7dnb,industry)
 apl-up2-uefi-hybrid-install:
 	$(call install_acrn,uefi,apl-up2,hybrid)
 
@@ -159,7 +159,7 @@ apl-mrb-sbl-sdc-install-debug:
 apl-up2-sbl-sdc-install-debug:
 	$(call install_acrn_debug,sbl,apl-up2,sdc)
 kbl-nuc-i7-uefi-industry-install-debug:
-	$(call install_acrn_debug,uefi,kbl-nuc-i7,industry)
+	$(call install_acrn_debug,uefi,nuc7i7dnb,industry)
 apl-up2-uefi-hybrid-install-debug:
 	$(call install_acrn_debug,uefi,apl-up2,hybrid)
 
diff --git a/misc/efi-stub/Makefile b/misc/efi-stub/Makefile
index ac8eb10e6..8a9a7d52b 100644
--- a/misc/efi-stub/Makefile
+++ b/misc/efi-stub/Makefile
@@ -91,22 +91,11 @@ all: $(EFIBIN)
 install: $(EFIBIN) install-conf
 	install -D $(EFIBIN) $(DESTDIR)/usr/lib/acrn/$(HV_FILE).$(BOARD).$(SCENARIO).efi
 # this is to keep the compatible with original output files
-ifeq ($(BOARD), nuc6cayh)
-    ifeq ($(SCENARIO), sdc)
-	install -D $(EFIBIN) $(DESTDIR)/usr/lib/acrn/$(HV_FILE).efi
-    endif
-endif
 
 install-debug: $(HV_OBJDIR)/$(HV_FILE).map $(HV_OBJDIR)/$(HV_FILE).out
 	install -D $(HV_OBJDIR)/$(HV_FILE).out $(DESTDIR)/usr/lib/acrn/$(HV_FILE).$(BOARD).$(SCENARIO).efi.out
 	install -D $(HV_OBJDIR)/$(HV_FILE).map $(DESTDIR)/usr/lib/acrn/$(HV_FILE).$(BOARD).$(SCENARIO).efi.map
 # this is to keep the compatible with original output files
-ifeq ($(BOARD), nuc6cayh)
-    ifeq ($(SCENARIO), sdc)
-	install -D $(HV_OBJDIR)/$(HV_FILE).out $(DESTDIR)/usr/lib/acrn/$(HV_FILE).efi.out
-	install -D $(HV_OBJDIR)/$(HV_FILE).map $(DESTDIR)/usr/lib/acrn/$(HV_FILE).efi.map
-    endif
-endif
 
 $(EFIBIN): $(BOOT)