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

226 lines
8.7 KiB
Makefile
Raw Normal View History

add a makefile under project root directory it can be used as following: make ==> to make hypervisor & devicemodel & tools also modify tools makefile to support out-dir setting. Signed-off-by: Minggui Cao <minggui.cao@intel.com> Reviewed-by: Jack Ren <jack.ren@intel.com>
2018-05-15 09:09:20 +08:00
# global helper variables
T := $(CURDIR)
Makefile: separate PLATFORM into BOARD+FIRMWARE Combination of BOARD and FIRMWARE is a more precious definition. And we decide PLATFORM_XXX based on FIRMWARE, remove relative one in board config. We reserve PLATFORM for backward compatibility. Tracked-On: #1995 Signed-off-by: Tw <wei.tan@intel.com> Reviewed-by: Yin Fengwei < fengwei.yin@intel.com> Reviewed-by: Binbin Wu <binbin.wu@intel.com>
2018-12-11 16:00:56 +08:00
Modify KBL-NUC/SDC for default build Tracked-On: #3968 Signed-off-by: wenlingz <wenling.zhang@intel.com>
2019-10-30 13:35:57 +08:00
BOARD ?= kbl-nuc-i7
Makefile: separate PLATFORM into BOARD+FIRMWARE Combination of BOARD and FIRMWARE is a more precious definition. And we decide PLATFORM_XXX based on FIRMWARE, remove relative one in board config. We reserve PLATFORM for backward compatibility. Tracked-On: #1995 Signed-off-by: Tw <wei.tan@intel.com> Reviewed-by: Yin Fengwei < fengwei.yin@intel.com> Reviewed-by: Binbin Wu <binbin.wu@intel.com>
2018-12-11 16:00:56 +08:00
make: white-list SBL firmware boards The top-level Makefile white-lists BOARDs require to generate UEFI executable, but more UEFI BOARDs have been supported since then. As a result, the build instructions in existing documents may not be sufficient for those new BOARD targets, if the reader misses to supply the FIRMWARE variable while building the hypervisor. Instead of adding new UEFI BOARD types using the original long if-else statements, I'd like to propose to white-list SBL BOARD types, and add the new SBL BOARD types to the list while needed. Tracked-On: #3541 Signed-off-by: Tonny Tzeng <tonny.tzeng@intel.com> Reviewed-by: Binbin Wu <binbin.wu@intel.com>
2019-08-06 19:46:31 +08:00
ifneq (,$(filter $(BOARD),apl-mrb))
FIRMWARE ?= sbl
else
FIRMWARE ?= uefi
Makefile: separate PLATFORM into BOARD+FIRMWARE Combination of BOARD and FIRMWARE is a more precious definition. And we decide PLATFORM_XXX based on FIRMWARE, remove relative one in board config. We reserve PLATFORM for backward compatibility. Tracked-On: #1995 Signed-off-by: Tw <wei.tan@intel.com> Reviewed-by: Yin Fengwei < fengwei.yin@intel.com> Reviewed-by: Binbin Wu <binbin.wu@intel.com>
2018-12-11 16:00:56 +08:00
endif
Makefile: keep using 'PLATFORM' variable for existing documentation Signed-off-by: Tonny Tzeng tonny.tzeng@intel.com
2018-05-17 16:44:11 +08:00
RELEASE ?= 0
Makefile: Refine Makefile to generate both industry and sdc images We are trying to add both industry and sdc images to CL build. To maintain the build interface unchanged (no change from CL side), we extend the build command to generate the different target images. To identity different images, we use rule: $(HV_FILE).$(BOARD).$(FIRMWARE).$(SCENARIO) as target image file name. Tracked-On: #3593 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
2019-08-14 11:27:21 +08:00
SCENARIO ?= sdc
add a makefile under project root directory it can be used as following: make ==> to make hypervisor & devicemodel & tools also modify tools makefile to support out-dir setting. Signed-off-by: Minggui Cao <minggui.cao@intel.com> Reviewed-by: Jack Ren <jack.ren@intel.com>
2018-05-15 09:09:20 +08:00
acrn: allow to specify the build output folder Usages: make O=<any folder> Signed-off-by: Jack Ren <jack.ren@intel.com>
2018-05-23 19:24:29 +08:00
O ?= build
ROOT_OUT := $(shell mkdir -p $(O);cd $(O);pwd)
add a makefile under project root directory it can be used as following: make ==> to make hypervisor & devicemodel & tools also modify tools makefile to support out-dir setting. Signed-off-by: Minggui Cao <minggui.cao@intel.com> Reviewed-by: Jack Ren <jack.ren@intel.com>
2018-05-15 09:09:20 +08:00
HV_OUT := $(ROOT_OUT)/hypervisor
makefile: fix efi stub install issue In commit "d0489ef3b7efcd4feca0a5ee11b1fd4f9a88864a", try to move the sbl-hypervisor target to function. But missed the EFI_OBJDIR parameter for install/install-debug function. Another problem is we use same EFI_OBJDIR for all uefi build. We now put the EFI_OBJDIR to the build out to avoid this issue. Tracked-On: #3779 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com> Acked-by: Binbin Wu <binbin.wu@intel.com>
2019-10-11 14:07:17 +08:00
EFI_OUT := misc/efi-stub
add a makefile under project root directory it can be used as following: make ==> to make hypervisor & devicemodel & tools also modify tools makefile to support out-dir setting. Signed-off-by: Minggui Cao <minggui.cao@intel.com> Reviewed-by: Jack Ren <jack.ren@intel.com>
2018-05-15 09:09:20 +08:00
DM_OUT := $(ROOT_OUT)/devicemodel
HV:Acrn-hypvervisor Root Directory Clean-up and create misc/ folder for Acrn daemons, services and tools. This patch is to clean-up acrn-hypervisor root directory, targt only 5 folders under acrn-hypervisor:1.hypervisor,2.devicemodel,3.misc,4.doc,5.build Tracked-On: #3482 Signed-off-by: Terry Zou <terry.zou@intel.com> Acked-by: Eddie Dong <eddie.dong@intel.com>
2019-07-29 12:21:54 +08:00
TOOLS_OUT := $(ROOT_OUT)/misc/tools
Build system: add target to build documentation This patch adds a new target to build the documentation from the top-level directory. Here is how to use it (from the top-level source directory): $ make doc Or $ make O=build-test doc To clean all documentation build artefacts, simply call $ make clean Or $ make O=build-test clean Calling 'make' with no arguments will *not* build the documentation by default. Signed-off-by: Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com>
2018-06-12 17:38:43 +08:00
DOC_OUT := $(ROOT_OUT)/doc
DM: add tag info while no repo in release there is no git repo, which download from github release, however, acrn-dm -v will get tag info from this repo, in such case, the tag info was null. this patch will fix nul tag, which get it from CL mock build. Tracked-On: #676 Signed-off-by: Wei Liu <weix.w.liu@intel.com> Reviewed-by: Jason Chen CJ <jason.cj.chen@intel.com>
2018-08-06 10:09:27 +08:00
BUILD_VERSION ?=
BUILD_TAG ?=
makefile: cover menuconfig way to configure board/scenario We now have four methods to configure board and scenario when build acrn (sorted with priority): 1. Change them with "make menuconfig" in hypervisor directory 2. Give baord_file/scenario_file as make command parameters 3. Give BOARD/SCENARIO as make command parameters 4. Use BOARD/SCENARIO default value defined in Makefile file With this patch, we make sure we follow priority exactly. Tracked-On: #4067 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com> Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-11-10 09:05:41 +08:00
DEFAULT_MENU_CONFIG_FILE ?= $(T)/hypervisor/build/.config
Makefile: do not rm board acpi info header The $(BOARD)_acpi_info.h is generated by acrn-config tool, remove this header in make clean would cause failure when user finish configuring in webUI and start to make acrn-hypervisor by the command "make hypervisor BOARD=xxx SCENARIO=yyy" because we mandatory do make clean before making hypervisor. The patch replace the file removal with a warning string to hint user to check the file validity. Tracked-On: #3779 Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-11-19 17:19:41 +08:00
GENED_ACPI_INFO_HEADER = $(T)/hypervisor/arch/x86/configs/$(BOARD)/$(BOARD)_acpi_info.h
Makefile: print config summary at the end The BOARD and SCENARIO parameter of make hypervisor might be overridden by menuconfig file or BOARD/SCENARIO XML files in make process, also the $(BOARD)_acpi_info.h would be involved in build if exist, but user might not be aware of that because the message could be easily ignored from flooding logs. So give the configuration summary at the end of hypervisor build process would be helpful for end user. Tracked-On: #3779 Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-12-09 12:13:49 +08:00
HV_CFG_LOG = $(HV_OUT)/cfg.log
makefile: cover menuconfig way to configure board/scenario We now have four methods to configure board and scenario when build acrn (sorted with priority): 1. Change them with "make menuconfig" in hypervisor directory 2. Give baord_file/scenario_file as make command parameters 3. Give BOARD/SCENARIO as make command parameters 4. Use BOARD/SCENARIO default value defined in Makefile file With this patch, we make sure we follow priority exactly. Tracked-On: #4067 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com> Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-11-10 09:05:41 +08:00
ifneq ($(BOARD_FILE),)
override BOARD_FILE := $(shell if [ -f $(BOARD_FILE) ]; then realpath $(BOARD_FILE); fi)
endif
ifneq ($(SCENARIO_FILE),)
override SCENARIO_FILE := $(shell if [ -f $(SCENARIO_FILE) ]; then realpath $(SCENARIO_FILE); fi)
endif
makefile: enable xml config to build hypervisor 1. This patch enabled one path for compiling the souce code which generated by acrn-config tools. The usage below: $ make hypervisor BOARD_FILE=$(board.xml) SCENARIO_FILE=$(scenario.xml) if BOARD_FILE and SCENARIO_FILE are not specified, fallback to previous compiling hypervisor usage: $ make hypervisor BOARD=$(board) SCENARIO=$(scenario) v1-v2: 1). update commit message Tracked-On: #3602 Signed-off-by: Wei Liu <weix.w.liu@intel.com> Reviewed-by: Binbin Wu <binbin.wu@intel.com>
2019-09-11 14:42:05 +08:00
Makefile: support make from XML for new board Currently make hypervisor will depend on a $(BOARD).config file to load board defconfig which triggered by oldconfig process, this will block make from XMLs for a new board because $(BOARD).config never exist. This requires us to patch configuration for new board earlier than make oldconfig. Tracked-On: #4067 Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-11-09 11:18:58 +08:00
export TOOLS_OUT BOARD SCENARIO FIRMWARE RELEASE
add a makefile under project root directory it can be used as following: make ==> to make hypervisor & devicemodel & tools also modify tools makefile to support out-dir setting. Signed-off-by: Minggui Cao <minggui.cao@intel.com> Reviewed-by: Jack Ren <jack.ren@intel.com>
2018-05-15 09:09:20 +08:00
misc: totally remove misc folder misc now has a new home: https://github.com/intel/ioc-cbc-tools. The "Execstop" patch will be synced to new git tree soon. ioc-cbc-tools was just added to Clear Linux, and will be added to software-defined-cockpit bundle after this patch merged. Merging this patch may cause some IOC releated feature block until we get a new Clear Linux release. This is the switch window ... Signed-off-by: Alek Du <alek.du@intel.com>
2018-08-09 09:25:13 +08:00
.PHONY: all hypervisor devicemodel tools doc
all: hypervisor devicemodel tools
Makefile: print config summary at the end The BOARD and SCENARIO parameter of make hypervisor might be overridden by menuconfig file or BOARD/SCENARIO XML files in make process, also the $(BOARD)_acpi_info.h would be involved in build if exist, but user might not be aware of that because the message could be easily ignored from flooding logs. So give the configuration summary at the end of hypervisor build process would be helpful for end user. Tracked-On: #3779 Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-12-09 12:13:49 +08:00
@cat $(HV_CFG_LOG)
add a makefile under project root directory it can be used as following: make ==> to make hypervisor & devicemodel & tools also modify tools makefile to support out-dir setting. Signed-off-by: Minggui Cao <minggui.cao@intel.com> Reviewed-by: Jack Ren <jack.ren@intel.com>
2018-05-15 09:09:20 +08:00
Makefile: override .config with specified scenario 1. if SCENARIO=$(SCENARIO) is specified in make param, then override the default CONFIG_$(SCENARIO) value in existed .config. This means we don't need to modify the default SCENARIO config in Kconfig file to build the hypervisor; 2. Some board name shortcuts like apl-nuc/kbl-nuc-i7 need to be converted to official board name to make sure overrides working; 3. Previously make sbl-hypervisor did not load the defconfig so the defconfig for boards are lost, this patch fix this issue; 4. remove SCENARIO param when make hypervisor, because SCENARIO could be got from SCENARIO_NAME which parsed from .config; Tracked-On: #3593 Signed-off-by: Victor Sun <victor.sun@intel.com> Reviewed-by: Yin Fengwei <fengwei.yin@intel.com>
2019-09-17 11:55:47 +08:00
ifeq ($(BOARD), apl-nuc)
makefile: cover menuconfig way to configure board/scenario We now have four methods to configure board and scenario when build acrn (sorted with priority): 1. Change them with "make menuconfig" in hypervisor directory 2. Give baord_file/scenario_file as make command parameters 3. Give BOARD/SCENARIO as make command parameters 4. Use BOARD/SCENARIO default value defined in Makefile file With this patch, we make sure we follow priority exactly. Tracked-On: #4067 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com> Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-11-10 09:05:41 +08:00
override BOARD := nuc6cayh
Makefile: override .config with specified scenario 1. if SCENARIO=$(SCENARIO) is specified in make param, then override the default CONFIG_$(SCENARIO) value in existed .config. This means we don't need to modify the default SCENARIO config in Kconfig file to build the hypervisor; 2. Some board name shortcuts like apl-nuc/kbl-nuc-i7 need to be converted to official board name to make sure overrides working; 3. Previously make sbl-hypervisor did not load the defconfig so the defconfig for boards are lost, this patch fix this issue; 4. remove SCENARIO param when make hypervisor, because SCENARIO could be got from SCENARIO_NAME which parsed from .config; Tracked-On: #3593 Signed-off-by: Victor Sun <victor.sun@intel.com> Reviewed-by: Yin Fengwei <fengwei.yin@intel.com>
2019-09-17 11:55:47 +08:00
else ifeq ($(BOARD), kbl-nuc-i7)
makefile: cover menuconfig way to configure board/scenario We now have four methods to configure board and scenario when build acrn (sorted with priority): 1. Change them with "make menuconfig" in hypervisor directory 2. Give baord_file/scenario_file as make command parameters 3. Give BOARD/SCENARIO as make command parameters 4. Use BOARD/SCENARIO default value defined in Makefile file With this patch, we make sure we follow priority exactly. Tracked-On: #4067 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com> Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-11-10 09:05:41 +08:00
override BOARD := nuc7i7dnb
Makefile: override .config with specified scenario 1. if SCENARIO=$(SCENARIO) is specified in make param, then override the default CONFIG_$(SCENARIO) value in existed .config. This means we don't need to modify the default SCENARIO config in Kconfig file to build the hypervisor; 2. Some board name shortcuts like apl-nuc/kbl-nuc-i7 need to be converted to official board name to make sure overrides working; 3. Previously make sbl-hypervisor did not load the defconfig so the defconfig for boards are lost, this patch fix this issue; 4. remove SCENARIO param when make hypervisor, because SCENARIO could be got from SCENARIO_NAME which parsed from .config; Tracked-On: #3593 Signed-off-by: Victor Sun <victor.sun@intel.com> Reviewed-by: Yin Fengwei <fengwei.yin@intel.com>
2019-09-17 11:55:47 +08:00
endif
makefile: cover menuconfig way to configure board/scenario We now have four methods to configure board and scenario when build acrn (sorted with priority): 1. Change them with "make menuconfig" in hypervisor directory 2. Give baord_file/scenario_file as make command parameters 3. Give BOARD/SCENARIO as make command parameters 4. Use BOARD/SCENARIO default value defined in Makefile file With this patch, we make sure we follow priority exactly. Tracked-On: #4067 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com> Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-11-10 09:05:41 +08:00
#BOARD and SCENARIO definition priority:
# If we do menuconfig in advance, the menuconfig will define
# BOARD
# SCENARIO
# else if we have board/scenario file avaiable, BOARD and SCENARIO will be
# extracted from files.
# else if make comand has BORAD/SCENARIO parameters, BOARD and SCENARIO will
# be gotten from parameters
# else
# default value defined in this make file will be used
#
Makefile: move .mk file to hv scripts folder The *.mk files under misc/acrn-config/library are all rules for hypervisor makefiles only, so move these files to hypervisor/scripts/makefile/ folder. The folder of acrn-config/library/ will be used to store python script lib only. Tracked-On: #3779 Signed-off-by: Victor Sun <victor.sun@intel.com> Reviewed-by: Terry Zou <terry.zou@intel.com>
2019-11-12 14:11:58 +08:00
include $(T)/hypervisor/scripts/makefile/cfg_update.mk
Makefile: support make from XML for new board Currently make hypervisor will depend on a $(BOARD).config file to load board defconfig which triggered by oldconfig process, this will block make from XMLs for a new board because $(BOARD).config never exist. This requires us to patch configuration for new board earlier than make oldconfig. Tracked-On: #4067 Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-11-09 11:18:58 +08:00
makefile: cover menuconfig way to configure board/scenario We now have four methods to configure board and scenario when build acrn (sorted with priority): 1. Change them with "make menuconfig" in hypervisor directory 2. Give baord_file/scenario_file as make command parameters 3. Give BOARD/SCENARIO as make command parameters 4. Use BOARD/SCENARIO default value defined in Makefile file With this patch, we make sure we follow priority exactly. Tracked-On: #4067 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com> Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-11-10 09:05:41 +08:00
ifeq ($(DEFAULT_MENU_CONFIG_FILE), $(wildcard $(DEFAULT_MENU_CONFIG_FILE)))
BOARD_IN_MENUCONFIG := $(shell grep CONFIG_BOARD= $(DEFAULT_MENU_CONFIG_FILE) | awk -F '"' '{print $$2}')
Makefile: fix make failure for logical_partition or hybrid scenario If "make menuconfig" chooses hybrid or logical_partition scenario, currently the build fails with "SCENARIO <$(SCENARIO)> is not supported.". - CONFIG_LOGICAL_PARTITION: "awk -F "_|=" '{print $$2}'" yields the second field (LOGICAL) only. The new "cut -d '_' -f 2-" keeps all fields after "CONFIG_". - Add the missing HYBRID scenario. Tracked-On: #4067 Signed-off-by: Zide Chen <zide.chen@intel.com> Reviewed-by: Victor Sun <victor.sun@intel.com>
2019-12-05 15:42:17 +08:00
SCENARIO_IN_MENUCONFIG := $(shell grep -E "SDC=y|SDC2=y|INDUSTRY=y|LOGICAL_PARTITION=y|HYBRID=y" \
$(DEFAULT_MENU_CONFIG_FILE) | awk -F "=" '{print $$1}' | cut -d '_' -f 2- | tr A-Z a-z)
makefile: cover menuconfig way to configure board/scenario We now have four methods to configure board and scenario when build acrn (sorted with priority): 1. Change them with "make menuconfig" in hypervisor directory 2. Give baord_file/scenario_file as make command parameters 3. Give BOARD/SCENARIO as make command parameters 4. Use BOARD/SCENARIO default value defined in Makefile file With this patch, we make sure we follow priority exactly. Tracked-On: #4067 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com> Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-11-10 09:05:41 +08:00
RELEASE := $(shell grep CONFIG_RELEASE=y $(DEFAULT_MENU_CONFIG_FILE))
ifneq ($(RELEASE),)
override RELEASE := 1
endif
ifneq ($(BOARD_IN_MENUCONFIG),$(BOARD))
override BOARD := $(BOARD_IN_MENUCONFIG)
endif
ifneq ($(SCENARIO_IN_MENUCONFIG),$(SCENARIO))
override SCENARIO := $(SCENARIO_IN_MENUCONFIG)
endif
endif
Makefile: Add acrn build/install functions To remove several duplicated Makefile cmdline, introduce the functions to build/install acrn. If we need to add new build to sbl-hypervisor (which is used by integration team), we only need to define a new target and call acrn build/install functions with correct parameters. And then make sbl-hypervisor depend on that new target. Tracked-On: #3779 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
2019-09-27 17:15:36 +08:00
#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=$(4) RELEASE=$(RELEASE) clean
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-$(1)/$(2) BOARD=$(2) FIRMWARE=$(1) SCENARIO=$(4) RELEASE=$(RELEASE) defconfig
@echo "$(3)=y" >> $(HV_OUT)-$(1)/$(2)/.config
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-$(1)/$(2) BOARD=$(2) FIRMWARE=$(1) SCENARIO=$(4) RELEASE=$(RELEASE) oldconfig
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-$(1)/$(2) BOARD=$(2) FIRMWARE=$(1) SCENARIO=$(4) RELEASE=$(RELEASE)
echo "building hypervisor as EFI executable..."
makefile: add dash support to build efi Usually We use '==' or '=' to compare strings under sh environment, but '==' is not supported by dash which is the default sh environment on Ubuntu, this leads efi build failure with current makefile. Change the '==' to '=' to support both bash and dash. Tracked-On: #3779 Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-10-24 14:22:42 +08:00
@if [ "$(1)" = "uefi" ]; then \
makefile: fix efi stub install issue In commit "d0489ef3b7efcd4feca0a5ee11b1fd4f9a88864a", try to move the sbl-hypervisor target to function. But missed the EFI_OBJDIR parameter for install/install-debug function. Another problem is we use same EFI_OBJDIR for all uefi build. We now put the EFI_OBJDIR to the build out to avoid this issue. Tracked-On: #3779 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com> Acked-by: Binbin Wu <binbin.wu@intel.com>
2019-10-11 14:07:17 +08:00
$(MAKE) -C $(T)/misc/efi-stub HV_OBJDIR=$(HV_OUT)-$(1)/$(2) SCENARIO=$(4) EFI_OBJDIR=$(HV_OUT)-$(1)/$(2)/$(EFI_OUT); \
Makefile: Add acrn build/install functions To remove several duplicated Makefile cmdline, introduce the functions to build/install acrn. If we need to add new build to sbl-hypervisor (which is used by integration team), we only need to define a new target and call acrn build/install functions with correct parameters. And then make sbl-hypervisor depend on that new target. Tracked-On: #3779 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
2019-09-27 17:15:36 +08:00
fi
endef
define install_acrn
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-$(1)/$(2) BOARD=$(2) FIRMWARE=$(1) SCENARIO=$(3) RELEASE=$(RELEASE) install
makefile: add dash support to build efi Usually We use '==' or '=' to compare strings under sh environment, but '==' is not supported by dash which is the default sh environment on Ubuntu, this leads efi build failure with current makefile. Change the '==' to '=' to support both bash and dash. Tracked-On: #3779 Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-10-24 14:22:42 +08:00
@if [ "$(1)" = "uefi" ]; then \
makefile: fix efi stub install issue In commit "d0489ef3b7efcd4feca0a5ee11b1fd4f9a88864a", try to move the sbl-hypervisor target to function. But missed the EFI_OBJDIR parameter for install/install-debug function. Another problem is we use same EFI_OBJDIR for all uefi build. We now put the EFI_OBJDIR to the build out to avoid this issue. Tracked-On: #3779 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com> Acked-by: Binbin Wu <binbin.wu@intel.com>
2019-10-11 14:07:17 +08:00
$(MAKE) -C $(T)/misc/efi-stub HV_OBJDIR=$(HV_OUT)-$(1)/$(2) BOARD=$(2) FIRMWARE=$(1) SCENARIO=$(3) RELEASE=$(RELEASE) EFI_OBJDIR=$(HV_OUT)-$(1)/$(2)/$(EFI_OUT) install; \
Makefile: Add acrn build/install functions To remove several duplicated Makefile cmdline, introduce the functions to build/install acrn. If we need to add new build to sbl-hypervisor (which is used by integration team), we only need to define a new target and call acrn build/install functions with correct parameters. And then make sbl-hypervisor depend on that new target. Tracked-On: #3779 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
2019-09-27 17:15:36 +08:00
fi
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
makefile: add dash support to build efi Usually We use '==' or '=' to compare strings under sh environment, but '==' is not supported by dash which is the default sh environment on Ubuntu, this leads efi build failure with current makefile. Change the '==' to '=' to support both bash and dash. Tracked-On: #3779 Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-10-24 14:22:42 +08:00
@if [ "$(1)" = "uefi" ]; then \
makefile: fix efi stub install issue In commit "d0489ef3b7efcd4feca0a5ee11b1fd4f9a88864a", try to move the sbl-hypervisor target to function. But missed the EFI_OBJDIR parameter for install/install-debug function. Another problem is we use same EFI_OBJDIR for all uefi build. We now put the EFI_OBJDIR to the build out to avoid this issue. Tracked-On: #3779 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com> Acked-by: Binbin Wu <binbin.wu@intel.com>
2019-10-11 14:07:17 +08:00
$(MAKE) -C $(T)/misc/efi-stub HV_OBJDIR=$(HV_OUT)-$(1)/$(2) BOARD=$(2) FIRMWARE=$(1) SCENARIO=$(3) RELEASE=$(RELEASE) EFI_OBJDIR=$(HV_OUT)-$(1)/$(2)/$(EFI_OUT) install-debug; \
Makefile: Add acrn build/install functions To remove several duplicated Makefile cmdline, introduce the functions to build/install acrn. If we need to add new build to sbl-hypervisor (which is used by integration team), we only need to define a new target and call acrn build/install functions with correct parameters. And then make sbl-hypervisor depend on that new target. Tracked-On: #3779 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
2019-09-27 17:15:36 +08:00
fi
endef
Makefile: generate config patch in hypervisor/Makefile Previously we generate config patch based on config xml in toplevel Makefile, it brings two issues: 1. we could not generate xml configuration patch with hypervisor source only; 2. The github commit info of current code base which is defined in version.h will be overwritten by the new generated config patch, then the lost commit info would impact build identify and bug reproducing. This patch fixed these two issues. Besides, the patch also modify the logic of platform_acpi_info file existence judgement, which need to be depends on the acrn-config patch. Tracked-On: #3602 Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-09-19 23:07:10 +08:00
hypervisor:
Makefile: support make from XML for new board Currently make hypervisor will depend on a $(BOARD).config file to load board defconfig which triggered by oldconfig process, this will block make from XMLs for a new board because $(BOARD).config never exist. This requires us to patch configuration for new board earlier than make oldconfig. Tracked-On: #4067 Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-11-09 11:18:58 +08:00
@if [ "$(SCENARIO)" != "sdc" ] && [ "$(SCENARIO)" != "sdc2" ] && [ "$(SCENARIO)" != "industry" ] \
&& [ "$(SCENARIO)" != "logical_partition" ] && [ "$(SCENARIO)" != "hybrid" ]; then \
echo "SCENARIO <$(SCENARIO)> is not supported. "; exit 1; \
Makefile: override .config with specified scenario 1. if SCENARIO=$(SCENARIO) is specified in make param, then override the default CONFIG_$(SCENARIO) value in existed .config. This means we don't need to modify the default SCENARIO config in Kconfig file to build the hypervisor; 2. Some board name shortcuts like apl-nuc/kbl-nuc-i7 need to be converted to official board name to make sure overrides working; 3. Previously make sbl-hypervisor did not load the defconfig so the defconfig for boards are lost, this patch fix this issue; 4. remove SCENARIO param when make hypervisor, because SCENARIO could be got from SCENARIO_NAME which parsed from .config; Tracked-On: #3593 Signed-off-by: Victor Sun <victor.sun@intel.com> Reviewed-by: Yin Fengwei <fengwei.yin@intel.com>
2019-09-17 11:55:47 +08:00
fi
Makefile: print config summary at the end The BOARD and SCENARIO parameter of make hypervisor might be overridden by menuconfig file or BOARD/SCENARIO XML files in make process, also the $(BOARD)_acpi_info.h would be involved in build if exist, but user might not be aware of that because the message could be easily ignored from flooding logs. So give the configuration summary at the end of hypervisor build process would be helpful for end user. Tracked-On: #3779 Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-12-09 12:13:49 +08:00
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) clean;
makefile: cover menuconfig way to configure board/scenario We now have four methods to configure board and scenario when build acrn (sorted with priority): 1. Change them with "make menuconfig" in hypervisor directory 2. Give baord_file/scenario_file as make command parameters 3. Give BOARD/SCENARIO as make command parameters 4. Use BOARD/SCENARIO default value defined in Makefile file With this patch, we make sure we follow priority exactly. Tracked-On: #4067 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com> Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-11-10 09:05:41 +08:00
@if [ -f $(DEFAULT_MENU_CONFIG_FILE) ]; then \
mkdir -p $(HV_OUT) && cp $(DEFAULT_MENU_CONFIG_FILE) $(HV_OUT)/.config; \
else \
Makefile: pass BOARD/SCENARIO FILE to make hv If we don't enforce passing BOARD_FILE/SCENARIO_FILE param to hypervisor/Makefile, the BOARD_FILE/SCENARIO_FILE value would not be overridden to its realpath in hypervisor/Makefile when make hypervisor. Tracked-On: #4067 Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-11-11 23:46:29 +08:00
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE) defconfig; \
Makefile: print config summary at the end The BOARD and SCENARIO parameter of make hypervisor might be overridden by menuconfig file or BOARD/SCENARIO XML files in make process, also the $(BOARD)_acpi_info.h would be involved in build if exist, but user might not be aware of that because the message could be easily ignored from flooding logs. So give the configuration summary at the end of hypervisor build process would be helpful for end user. Tracked-On: #3779 Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-12-09 12:13:49 +08:00
echo "CONFIG_$(shell echo $(SCENARIO) | tr a-z A-Z)=y" >> $(HV_OUT)/.config; \
makefile: cover menuconfig way to configure board/scenario We now have four methods to configure board and scenario when build acrn (sorted with priority): 1. Change them with "make menuconfig" in hypervisor directory 2. Give baord_file/scenario_file as make command parameters 3. Give BOARD/SCENARIO as make command parameters 4. Use BOARD/SCENARIO default value defined in Makefile file With this patch, we make sure we follow priority exactly. Tracked-On: #4067 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com> Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-11-10 09:05:41 +08:00
if [ "$(CONFIG_XML_ENABLED)" = "true" ]; then \
echo "CONFIG_ENFORCE_VALIDATED_ACPI_INFO=y" >> $(HV_OUT)/.config; \
Makefile: do not rm board acpi info header The $(BOARD)_acpi_info.h is generated by acrn-config tool, remove this header in make clean would cause failure when user finish configuring in webUI and start to make acrn-hypervisor by the command "make hypervisor BOARD=xxx SCENARIO=yyy" because we mandatory do make clean before making hypervisor. The patch replace the file removal with a warning string to hint user to check the file validity. Tracked-On: #3779 Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-11-19 17:19:41 +08:00
fi; \
Makefile: override .config with specified scenario 1. if SCENARIO=$(SCENARIO) is specified in make param, then override the default CONFIG_$(SCENARIO) value in existed .config. This means we don't need to modify the default SCENARIO config in Kconfig file to build the hypervisor; 2. Some board name shortcuts like apl-nuc/kbl-nuc-i7 need to be converted to official board name to make sure overrides working; 3. Previously make sbl-hypervisor did not load the defconfig so the defconfig for boards are lost, this patch fix this issue; 4. remove SCENARIO param when make hypervisor, because SCENARIO could be got from SCENARIO_NAME which parsed from .config; Tracked-On: #3593 Signed-off-by: Victor Sun <victor.sun@intel.com> Reviewed-by: Yin Fengwei <fengwei.yin@intel.com>
2019-09-17 11:55:47 +08:00
fi
Makefile: pass BOARD/SCENARIO FILE to make hv If we don't enforce passing BOARD_FILE/SCENARIO_FILE param to hypervisor/Makefile, the BOARD_FILE/SCENARIO_FILE value would not be overridden to its realpath in hypervisor/Makefile when make hypervisor. Tracked-On: #4067 Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-11-11 23:46:29 +08:00
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD_FILE=$(BOARD_FILE) SCENARIO_FILE=$(SCENARIO_FILE)
Makefile: support make from XML for new board Currently make hypervisor will depend on a $(BOARD).config file to load board defconfig which triggered by oldconfig process, this will block make from XMLs for a new board because $(BOARD).config never exist. This requires us to patch configuration for new board earlier than make oldconfig. Tracked-On: #4067 Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-11-09 11:18:58 +08:00
#ifeq ($(FIRMWARE),uefi)
@if [ "$(SCENARIO)" != "logical_partition" ] && [ "$(SCENARIO)" != "hybrid" ]; then \
echo "building hypervisor as EFI executable..."; \
$(MAKE) -C $(T)/misc/efi-stub HV_OBJDIR=$(HV_OUT) EFI_OBJDIR=$(HV_OUT)/$(EFI_OUT); \
fi
#endif
Makefile: print config summary at the end The BOARD and SCENARIO parameter of make hypervisor might be overridden by menuconfig file or BOARD/SCENARIO XML files in make process, also the $(BOARD)_acpi_info.h would be involved in build if exist, but user might not be aware of that because the message could be easily ignored from flooding logs. So give the configuration summary at the end of hypervisor build process would be helpful for end user. Tracked-On: #3779 Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-12-09 12:13:49 +08:00
@echo -e "\n\033[47;30mACRN Configuration Summary:\033[0m \nBOARD = $(BOARD)\t SCENARIO = $(SCENARIO)" > $(HV_CFG_LOG); \
if [ -f $(DEFAULT_MENU_CONFIG_FILE) ]; then \
echo "Hypervisor configuration is based on menuconfig file: ./hypervisor/build/.config;" >> $(HV_CFG_LOG); \
else \
echo "Hypervisor configuration is based on ./hypervisor/arch/x86/Kconfig and ./hypervisor/arch/x86/configs/$(BOARD).config;" >> $(HV_CFG_LOG); \
fi; \
if [ "$(CONFIG_XML_ENABLED)" = "true" ]; then \
echo "VM configuration is based on $(BOARD_FILE) and $(SCENARIO_FILE);" >> $(HV_CFG_LOG); \
else \
echo "VM configuration is based on current code base;" >> $(HV_CFG_LOG); \
fi; \
if [ -f $(GENED_ACPI_INFO_HEADER) ] && [ "$(CONFIG_XML_ENABLED)" != "true" ]; then \
echo -e "\033[33mWarning: The platform ACPI info is based on acrn-config generated $(GENED_ACPI_INFO_HEADER), please make sure its validity.\033[0m" >> $(HV_CFG_LOG); \
fi
@cat $(HV_CFG_LOG)
Makefile: add a target to build sbl hypervisor To build with only one command the sbl and efi hypervisor a target was added which build the SBL hypervisor version. Now you can call "make all sbl-hypervisor" and "make install sbl-hypervisor-install" Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>
2018-05-24 17:39:59 +08:00
DM: adapt dm-monitor and acrnctl to use the helpers Adapt dm-monitor and acrnctl to use the helper functions and new message definitions in acrn_mngr.h. These jobs must be done in one commit to avoid build problems: 1. message transmission and callback registration code are moved to libacrn-mngr.a, so old functions in dm-monitor could be removed to make code clean; 2. remove unnecessary monior_msg.h; 3. minor changes to acrnctl accordingly. Reviewed-by: Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com> Reviewed-by: Kevin Tian <kevin.tian@intel.com> Reviewed-by: Wang, Yu <yu1.wang@intel.com> signed-off-by: Yan Like <like.yan@intel.com> Signed-off-by: Tao Yuhong <yuhong.tao@intel.com>
2018-05-30 02:16:56 +08:00
devicemodel: tools
acrn-dm: enable debug option for acrn-dm enable acrn-dm debug option via RELEASE=0(by default) Tracked-On: #2939 Reviewed-by: Minggui Cao <minggui.cao@intel.com> Signed-off-by: Wei Liu <weix.w.liu@intel.com> Acked-by: Yu Wang <yu1.wang@intel.com>
2019-04-16 10:59:25 +08:00
$(MAKE) -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) RELEASE=$(RELEASE) clean
$(MAKE) -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) DM_BUILD_VERSION=$(BUILD_VERSION) DM_BUILD_TAG=$(BUILD_TAG) DM_ASL_COMPILER=$(ASL_COMPILER) RELEASE=$(RELEASE)
add a makefile under project root directory it can be used as following: make ==> to make hypervisor & devicemodel & tools also modify tools makefile to support out-dir setting. Signed-off-by: Minggui Cao <minggui.cao@intel.com> Reviewed-by: Jack Ren <jack.ren@intel.com>
2018-05-15 09:09:20 +08:00
tools:
mkdir -p $(TOOLS_OUT)
HV:Acrn-hypvervisor Root Directory Clean-up and create misc/ folder for Acrn daemons, services and tools. This patch is to clean-up acrn-hypervisor root directory, targt only 5 folders under acrn-hypervisor:1.hypervisor,2.devicemodel,3.misc,4.doc,5.build Tracked-On: #3482 Signed-off-by: Terry Zou <terry.zou@intel.com> Acked-by: Eddie Dong <eddie.dong@intel.com>
2019-07-29 12:21:54 +08:00
$(MAKE) -C $(T)/misc OUT_DIR=$(TOOLS_OUT) RELEASE=$(RELEASE)
add a makefile under project root directory it can be used as following: make ==> to make hypervisor & devicemodel & tools also modify tools makefile to support out-dir setting. Signed-off-by: Minggui Cao <minggui.cao@intel.com> Reviewed-by: Jack Ren <jack.ren@intel.com>
2018-05-15 09:09:20 +08:00
Build system: add target to build documentation This patch adds a new target to build the documentation from the top-level directory. Here is how to use it (from the top-level source directory): $ make doc Or $ make O=build-test doc To clean all documentation build artefacts, simply call $ make clean Or $ make O=build-test clean Calling 'make' with no arguments will *not* build the documentation by default. Signed-off-by: Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com>
2018-06-12 17:38:43 +08:00
doc:
Use $(MAKE) when recursing Using 'make' directly means that the jobserver environment variables don't get passed down, so sub-builds for example don't use -j. This is documented as the wrong thing to do: https://www.gnu.org/software/make/manual/html_node/MAKE-Variable.html#MAKE-Variable Use $(MAKE) instead, and compile times drastically improve: acrn-devicemodel do_compile -13.5s -89.6% 15.0s -> 1.6s Tracked-On: #2370 Signed-off-by: Ross Burton <ross.burton@intel.com>
2019-01-17 05:35:20 +08:00
$(MAKE) -C $(T)/doc html BUILDDIR=$(DOC_OUT)
Build system: add target to build documentation This patch adds a new target to build the documentation from the top-level directory. Here is how to use it (from the top-level source directory): $ make doc Or $ make O=build-test doc To clean all documentation build artefacts, simply call $ make clean Or $ make O=build-test clean Calling 'make' with no arguments will *not* build the documentation by default. Signed-off-by: Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com>
2018-06-12 17:38:43 +08:00
add a makefile under project root directory it can be used as following: make ==> to make hypervisor & devicemodel & tools also modify tools makefile to support out-dir setting. Signed-off-by: Minggui Cao <minggui.cao@intel.com> Reviewed-by: Jack Ren <jack.ren@intel.com>
2018-05-15 09:09:20 +08:00
.PHONY: clean
clean:
HV:Acrn-hypvervisor Root Directory Clean-up and create misc/ folder for Acrn daemons, services and tools. This patch is to clean-up acrn-hypervisor root directory, targt only 5 folders under acrn-hypervisor:1.hypervisor,2.devicemodel,3.misc,4.doc,5.build Tracked-On: #3482 Signed-off-by: Terry Zou <terry.zou@intel.com> Acked-by: Eddie Dong <eddie.dong@intel.com>
2019-07-29 12:21:54 +08:00
$(MAKE) -C $(T)/misc OUT_DIR=$(TOOLS_OUT) clean
Use $(MAKE) when recursing Using 'make' directly means that the jobserver environment variables don't get passed down, so sub-builds for example don't use -j. This is documented as the wrong thing to do: https://www.gnu.org/software/make/manual/html_node/MAKE-Variable.html#MAKE-Variable Use $(MAKE) instead, and compile times drastically improve: acrn-devicemodel do_compile -13.5s -89.6% 15.0s -> 1.6s Tracked-On: #2370 Signed-off-by: Ross Burton <ross.burton@intel.com>
2019-01-17 05:35:20 +08:00
$(MAKE) -C $(T)/doc BUILDDIR=$(DOC_OUT) clean
add a makefile under project root directory it can be used as following: make ==> to make hypervisor & devicemodel & tools also modify tools makefile to support out-dir setting. Signed-off-by: Minggui Cao <minggui.cao@intel.com> Reviewed-by: Jack Ren <jack.ren@intel.com>
2018-05-15 09:09:20 +08:00
rm -rf $(ROOT_OUT)
tools: acrn-crashlog: add service/config files and scripts This patch adds the service files, config files and script to run automatically at boot. And it adds install/uninstall part in Makefile. Compatiblity code for libsystemd.so and libsystemd-journal.so is added in Makefile also. Signed-off-by: Jin Zhi <zhi.jin@intel.com> Signed-off-by: CHEN Gang <gang.c.chen@intel.com> Reviewed-by: Zhang Yanmin <yanmin.zhang@intel.com> Reviewed-by: Liu Chuansheng <chuansheng.liu@intel.com> Reviewed-by: Zhao Yakui <yakui.zhao@intel.com> Reviewed-by: Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com> Acked-by: Eddie Dong <Eddie.dong@intel.com>
2018-05-18 16:38:19 +08:00
Makefile: implement make install The make install target was missing. This commits adds the intall target which uses the install target from subprojects. Also a make install target was created in each tool program. Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>
2018-05-17 03:21:45 +08:00
.PHONY: install
misc: totally remove misc folder misc now has a new home: https://github.com/intel/ioc-cbc-tools. The "Execstop" patch will be synced to new git tree soon. ioc-cbc-tools was just added to Clear Linux, and will be added to software-defined-cockpit bundle after this patch merged. Merging this patch may cause some IOC releated feature block until we get a new Clear Linux release. This is the switch window ... Signed-off-by: Alek Du <alek.du@intel.com>
2018-08-09 09:25:13 +08:00
install: hypervisor-install devicemodel-install tools-install
add a makefile under project root directory it can be used as following: make ==> to make hypervisor & devicemodel & tools also modify tools makefile to support out-dir setting. Signed-off-by: Minggui Cao <minggui.cao@intel.com> Reviewed-by: Jack Ren <jack.ren@intel.com>
2018-05-15 09:09:20 +08:00
Makefile: generate config patch in hypervisor/Makefile Previously we generate config patch based on config xml in toplevel Makefile, it brings two issues: 1. we could not generate xml configuration patch with hypervisor source only; 2. The github commit info of current code base which is defined in version.h will be overwritten by the new generated config patch, then the lost commit info would impact build identify and bug reproducing. This patch fixed these two issues. Besides, the patch also modify the logic of platform_acpi_info file existence judgement, which need to be depends on the acrn-config patch. Tracked-On: #3602 Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-09-19 23:07:10 +08:00
hypervisor-install:
Makefile: Refine Makefile to generate both industry and sdc images We are trying to add both industry and sdc images to CL build. To maintain the build interface unchanged (no change from CL side), we extend the build command to generate the different target images. To identity different images, we use rule: $(HV_FILE).$(BOARD).$(FIRMWARE).$(SCENARIO) as target image file name. Tracked-On: #3593 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
2019-08-14 11:27:21 +08:00
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) SCENARIO=$(SCENARIO) RELEASE=$(RELEASE) install
Makefile: eliminate mistakes due to deprecated PLATFORM PLATFORM is deprecated, let's use it only for board detection Tracked-On: #1995 Signed-off-by: Tw <wei.tan@intel.com> Reviewed-by: Binbin Wu <binbin.wu@intel.com>
2018-12-18 13:42:53 +08:00
ifeq ($(FIRMWARE),uefi)
makefile: fix efi stub install issue In commit "d0489ef3b7efcd4feca0a5ee11b1fd4f9a88864a", try to move the sbl-hypervisor target to function. But missed the EFI_OBJDIR parameter for install/install-debug function. Another problem is we use same EFI_OBJDIR for all uefi build. We now put the EFI_OBJDIR to the build out to avoid this issue. Tracked-On: #3779 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com> Acked-by: Binbin Wu <binbin.wu@intel.com>
2019-10-11 14:07:17 +08:00
$(MAKE) -C $(T)/misc/efi-stub HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) SCENARIO=$(SCENARIO) EFI_OBJDIR=$(HV_OUT)/$(EFI_OUT) all install
modulization:move out efi dir from hypervisor move acrn-hypervisor/hypervisor/bsp/uefi/efi to arcn-hypervisor/efi-stub move acrn-hypervisor/hypervisor/bsp/uefi/clearlinux to acrn-hypervisor/efi-stub/clearlinux Changes to be committed: modified: Makefile modified: doc/getting-started/apl-nuc.rst renamed: hypervisor/bsp/uefi/efi/Makefile -> efi-stub/Makefile renamed: hypervisor/bsp/uefi/efi/boot.c -> efi-stub/boot.c renamed: hypervisor/bsp/uefi/efi/boot.h -> efi-stub/boot.h renamed: hypervisor/bsp/uefi/clearlinux/acrn.conf -> efi-stub/clearlinux/acrn.conf renamed: hypervisor/bsp/uefi/efi/efilinux.h -> efi-stub/efilinux.h renamed: hypervisor/bsp/uefi/efi/malloc.c -> efi-stub/malloc.c renamed: hypervisor/bsp/uefi/efi/multiboot.h -> efi-stub/multiboot.h renamed: hypervisor/bsp/uefi/efi/pe.c -> efi-stub/pe.c renamed: hypervisor/bsp/uefi/efi/stdlib.h -> efi-stub/stdlib.h modified: hypervisor/Makefile Tracked-On: #1842 Signed-off-by: Mingqiang Chi <mingqiang.chi@intel.com> Acked-by: Anthony Xu <anthony.xu@intel.com>
2018-12-10 19:32:42 +08:00
endif
Makefile: implement make install The make install target was missing. This commits adds the intall target which uses the install target from subprojects. Also a make install target was created in each tool program. Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>
2018-05-17 03:21:45 +08:00
Makefile: generate config patch in hypervisor/Makefile Previously we generate config patch based on config xml in toplevel Makefile, it brings two issues: 1. we could not generate xml configuration patch with hypervisor source only; 2. The github commit info of current code base which is defined in version.h will be overwritten by the new generated config patch, then the lost commit info would impact build identify and bug reproducing. This patch fixed these two issues. Besides, the patch also modify the logic of platform_acpi_info file existence judgement, which need to be depends on the acrn-config patch. Tracked-On: #3602 Signed-off-by: Victor Sun <victor.sun@intel.com>
2019-09-19 23:07:10 +08:00
hypervisor-install-debug:
Makefile: Refine Makefile to generate both industry and sdc images We are trying to add both industry and sdc images to CL build. To maintain the build interface unchanged (no change from CL side), we extend the build command to generate the different target images. To identity different images, we use rule: $(HV_FILE).$(BOARD).$(FIRMWARE).$(SCENARIO) as target image file name. Tracked-On: #3593 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
2019-08-14 11:27:21 +08:00
$(MAKE) -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) SCENARIO=$(SCENARIO) RELEASE=$(RELEASE) install-debug
Makefile: add rules for installing debug information Add rules for installing debug information. Tracked-On: #2344 Signed-off-by: Tw <wei.tan@intel.com> Reviewed-by: Binbin Wu <binbin.wu@intel.com>
2019-01-22 11:12:53 +08:00
ifeq ($(FIRMWARE),uefi)
makefile: fix efi stub install issue In commit "d0489ef3b7efcd4feca0a5ee11b1fd4f9a88864a", try to move the sbl-hypervisor target to function. But missed the EFI_OBJDIR parameter for install/install-debug function. Another problem is we use same EFI_OBJDIR for all uefi build. We now put the EFI_OBJDIR to the build out to avoid this issue. Tracked-On: #3779 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com> Acked-by: Binbin Wu <binbin.wu@intel.com>
2019-10-11 14:07:17 +08:00
$(MAKE) -C $(T)/misc/efi-stub HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) SCENARIO=$(SCENARIO) EFI_OBJDIR=$(HV_OUT)/$(EFI_OUT) all install-debug
Makefile: add rules for installing debug information Add rules for installing debug information. Tracked-On: #2344 Signed-off-by: Tw <wei.tan@intel.com> Reviewed-by: Binbin Wu <binbin.wu@intel.com>
2019-01-22 11:12:53 +08:00
endif
Makefile: Add acrn build/install functions To remove several duplicated Makefile cmdline, introduce the functions to build/install acrn. If we need to add new build to sbl-hypervisor (which is used by integration team), we only need to define a new target and call acrn build/install functions with correct parameters. And then make sbl-hypervisor depend on that new target. Tracked-On: #3779 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
2019-09-27 17:15:36 +08:00
apl-mrb-sbl-sdc:
$(call build_acrn,sbl,apl-mrb,CONFIG_SDC,sdc)
apl-up2-sbl-sdc:
$(call build_acrn,sbl,apl-up2,CONFIG_SDC,sdc)
kbl-nuc-i7-uefi-industry:
Modify KBL-NUC/SDC for default build Tracked-On: #3968 Signed-off-by: wenlingz <wenling.zhang@intel.com>
2019-10-30 13:35:57 +08:00
$(call build_acrn,uefi,nuc7i7dnb,CONFIG_INDUSTRY,industry)
Makefile: Add new build target for apl-up2/uefi/hybrid Add new build target for hybrid mode with uefi on platform apl-up2. Also break long dependency target line to short one. Tracked-On: #3779 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
2019-10-08 13:29:55 +08:00
apl-up2-uefi-hybrid:
$(call build_acrn,uefi,apl-up2,CONFIG_HYBRID,hybrid)
Makefile: Add acrn build/install functions To remove several duplicated Makefile cmdline, introduce the functions to build/install acrn. If we need to add new build to sbl-hypervisor (which is used by integration team), we only need to define a new target and call acrn build/install functions with correct parameters. And then make sbl-hypervisor depend on that new target. Tracked-On: #3779 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
2019-09-27 17:15:36 +08:00
Makefile: Add new build target for apl-up2/uefi/hybrid Add new build target for hybrid mode with uefi on platform apl-up2. Also break long dependency target line to short one. Tracked-On: #3779 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
2019-10-08 13:29:55 +08:00
sbl-hypervisor: apl-mrb-sbl-sdc \
apl-up2-sbl-sdc \
kbl-nuc-i7-uefi-industry \
apl-up2-uefi-hybrid
Makefile: Add acrn build/install functions To remove several duplicated Makefile cmdline, introduce the functions to build/install acrn. If we need to add new build to sbl-hypervisor (which is used by integration team), we only need to define a new target and call acrn build/install functions with correct parameters. And then make sbl-hypervisor depend on that new target. Tracked-On: #3779 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
2019-09-27 17:15:36 +08:00
apl-mrb-sbl-sdc-install:
$(call install_acrn,sbl,apl-mrb,sdc)
apl-up2-sbl-sdc-install:
$(call install_acrn,sbl,apl-up2,sdc)
kbl-nuc-i7-uefi-industry-install:
Modify KBL-NUC/SDC for default build Tracked-On: #3968 Signed-off-by: wenlingz <wenling.zhang@intel.com>
2019-10-30 13:35:57 +08:00
$(call install_acrn,uefi,nuc7i7dnb,industry)
Makefile: Add new build target for apl-up2/uefi/hybrid Add new build target for hybrid mode with uefi on platform apl-up2. Also break long dependency target line to short one. Tracked-On: #3779 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
2019-10-08 13:29:55 +08:00
apl-up2-uefi-hybrid-install:
$(call install_acrn,uefi,apl-up2,hybrid)
Makefile: Add acrn build/install functions To remove several duplicated Makefile cmdline, introduce the functions to build/install acrn. If we need to add new build to sbl-hypervisor (which is used by integration team), we only need to define a new target and call acrn build/install functions with correct parameters. And then make sbl-hypervisor depend on that new target. Tracked-On: #3779 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
2019-09-27 17:15:36 +08:00
Makefile: Add new build target for apl-up2/uefi/hybrid Add new build target for hybrid mode with uefi on platform apl-up2. Also break long dependency target line to short one. Tracked-On: #3779 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
2019-10-08 13:29:55 +08:00
sbl-hypervisor-install: apl-mrb-sbl-sdc-install \
apl-up2-sbl-sdc-install \
kbl-nuc-i7-uefi-industry-install \
apl-up2-uefi-hybrid-install
Makefile: Add acrn build/install functions To remove several duplicated Makefile cmdline, introduce the functions to build/install acrn. If we need to add new build to sbl-hypervisor (which is used by integration team), we only need to define a new target and call acrn build/install functions with correct parameters. And then make sbl-hypervisor depend on that new target. Tracked-On: #3779 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
2019-09-27 17:15:36 +08:00
apl-mrb-sbl-sdc-install-debug:
$(call install_acrn_debug,sbl,apl-mrb,sdc)
apl-up2-sbl-sdc-install-debug:
$(call install_acrn_debug,sbl,apl-up2,sdc)
kbl-nuc-i7-uefi-industry-install-debug:
Modify KBL-NUC/SDC for default build Tracked-On: #3968 Signed-off-by: wenlingz <wenling.zhang@intel.com>
2019-10-30 13:35:57 +08:00
$(call install_acrn_debug,uefi,nuc7i7dnb,industry)
Makefile: Add new build target for apl-up2/uefi/hybrid Add new build target for hybrid mode with uefi on platform apl-up2. Also break long dependency target line to short one. Tracked-On: #3779 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
2019-10-08 13:29:55 +08:00
apl-up2-uefi-hybrid-install-debug:
$(call install_acrn_debug,uefi,apl-up2,hybrid)
Makefile: Add acrn build/install functions To remove several duplicated Makefile cmdline, introduce the functions to build/install acrn. If we need to add new build to sbl-hypervisor (which is used by integration team), we only need to define a new target and call acrn build/install functions with correct parameters. And then make sbl-hypervisor depend on that new target. Tracked-On: #3779 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
2019-09-27 17:15:36 +08:00
Makefile: Add new build target for apl-up2/uefi/hybrid Add new build target for hybrid mode with uefi on platform apl-up2. Also break long dependency target line to short one. Tracked-On: #3779 Signed-off-by: Yin Fengwei <fengwei.yin@intel.com>
2019-10-08 13:29:55 +08:00
sbl-hypervisor-install-debug: apl-mrb-sbl-sdc-install-debug \
apl-up2-sbl-sdc-install-debug \
kbl-nuc-i7-uefi-industry-install-debug \
apl-up2-uefi-hybrid-install-debug
Makefile: add rules for installing debug information Add rules for installing debug information. Tracked-On: #2344 Signed-off-by: Tw <wei.tan@intel.com> Reviewed-by: Binbin Wu <binbin.wu@intel.com>
2019-01-22 11:12:53 +08:00
Makefile: implement make install The make install target was missing. This commits adds the intall target which uses the install target from subprojects. Also a make install target was created in each tool program. Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>
2018-05-17 03:21:45 +08:00
devicemodel-install:
Use $(MAKE) when recursing Using 'make' directly means that the jobserver environment variables don't get passed down, so sub-builds for example don't use -j. This is documented as the wrong thing to do: https://www.gnu.org/software/make/manual/html_node/MAKE-Variable.html#MAKE-Variable Use $(MAKE) instead, and compile times drastically improve: acrn-devicemodel do_compile -13.5s -89.6% 15.0s -> 1.6s Tracked-On: #2370 Signed-off-by: Ross Burton <ross.burton@intel.com>
2019-01-17 05:35:20 +08:00
$(MAKE) -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) install
Makefile: implement make install The make install target was missing. This commits adds the intall target which uses the install target from subprojects. Also a make install target was created in each tool program. Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>
2018-05-17 03:21:45 +08:00
Makefile: fix typos and style Remove the trailing ";" and "\" and fix a typo in install. Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>
2018-05-17 06:59:53 +08:00
tools-install:
HV:Acrn-hypvervisor Root Directory Clean-up and create misc/ folder for Acrn daemons, services and tools. This patch is to clean-up acrn-hypervisor root directory, targt only 5 folders under acrn-hypervisor:1.hypervisor,2.devicemodel,3.misc,4.doc,5.build Tracked-On: #3482 Signed-off-by: Terry Zou <terry.zou@intel.com> Acked-by: Eddie Dong <eddie.dong@intel.com>
2019-07-29 12:21:54 +08:00
$(MAKE) -C $(T)/misc OUT_DIR=$(TOOLS_OUT) RELEASE=$(RELEASE) install