OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Modify KBL-NUC/SDC for default build 

Tracked-On: #3968
Signed-off-by: wenlingz <wenling.zhang@intel.com>
This commit is contained in:
wenlingz 2019-10-30 13:35:57 +08:00 committed by wenlingz
parent 98fa9a81cd
commit c8fa8e15f8
2 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -2,7 +2,7 @@
# global helper variables # global helper variables
T := $(CURDIR) T := $(CURDIR)
BOARD ?= apl-nuc BOARD ?= kbl-nuc-i7
ifneq (,$(filter $(BOARD),apl-mrb)) ifneq (,$(filter $(BOARD),apl-mrb))
FIRMWARE ?= sbl FIRMWARE ?= sbl
@ -131,7 +131,7 @@ apl-mrb-sbl-sdc:
apl-up2-sbl-sdc: apl-up2-sbl-sdc:
$(call build_acrn,sbl,apl-up2,CONFIG_SDC,sdc) $(call build_acrn,sbl,apl-up2,CONFIG_SDC,sdc)
kbl-nuc-i7-uefi-industry: 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: apl-up2-uefi-hybrid:
$(call build_acrn,uefi,apl-up2,CONFIG_HYBRID,hybrid) $(call build_acrn,uefi,apl-up2,CONFIG_HYBRID,hybrid)
@ -145,7 +145,7 @@ apl-mrb-sbl-sdc-install:
apl-up2-sbl-sdc-install: apl-up2-sbl-sdc-install:
$(call install_acrn,sbl,apl-up2,sdc) $(call install_acrn,sbl,apl-up2,sdc)
kbl-nuc-i7-uefi-industry-install: 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: apl-up2-uefi-hybrid-install:
$(call install_acrn,uefi,apl-up2,hybrid) $(call install_acrn,uefi,apl-up2,hybrid)
@ -159,7 +159,7 @@ apl-mrb-sbl-sdc-install-debug:
apl-up2-sbl-sdc-install-debug: apl-up2-sbl-sdc-install-debug:
$(call install_acrn_debug,sbl,apl-up2,sdc) $(call install_acrn_debug,sbl,apl-up2,sdc)
kbl-nuc-i7-uefi-industry-install-debug: 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: apl-up2-uefi-hybrid-install-debug:
$(call install_acrn_debug,uefi,apl-up2,hybrid) $(call install_acrn_debug,uefi,apl-up2,hybrid)

13
misc/efi-stub/Makefile
View File

@ -90,23 +90,10 @@ all: $(EFIBIN)
install: $(EFIBIN) install-conf install: $(EFIBIN) install-conf
install -D $(EFIBIN) $(DESTDIR)/usr/lib/acrn/$(HV_FILE).$(BOARD).$(SCENARIO).efi 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-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).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 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) $(EFIBIN): $(BOOT)