github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-07-04 11:07:51 +00:00
Code Issues Projects Releases Wiki Activity

Kconfig: remove PLATFORM configuration option

Browse Source 
The PLATFORM configuration option is not used in any unique way. With simple
changes, we can directly use CONFIG_PLATFORM_UEFI and CONFIG_PLATFORM_SBL to
compile the ACRN hypervisor. This patch removes this config option and adjusts
the hypervisor Makefile accordingly.

The "old" way of specifying the platform from the command-line is not affected
by these changes, e.g.: "make PLATFORM=sbl"

Tracked-On: #1588
Signed-off-by: Geoffroy Van Cutsem <geoffroy.vancutsem@intel.com>
This commit is contained in:
Geoffroy Van Cutsem 2018-11-19 14:34:56 +01:00 committed by Xie, Nanlin
parent 7eeeccdfad
commit 512dbb61e3
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hypervisor/Makefile
View File

@ -207,15 +207,17 @@ C_SRCS += dm/vpci/msi.c
C_SRCS += dm/vpci/msix.c C_SRCS += dm/vpci/msix.c
endif endif
C_SRCS += bsp/$(CONFIG_PLATFORM)/$(CONFIG_PLATFORM).c ifeq ($(CONFIG_PLATFORM_UEFI),y)
C_SRCS += bsp/uefi/uefi.c
ifeq ($(CONFIG_PLATFORM),uefi) C_SRCS += bsp/uefi/cmdline.c
C_SRCS += bsp/$(CONFIG_PLATFORM)/cmdline.c TEMPLATE_ACPI_INFO_HEADER := bsp/include/uefi/platform_acpi_info.h
else else
ifeq ($(CONFIG_PLATFORM), sbl) ifeq ($(CONFIG_PLATFORM_SBL),y)
C_SRCS += bsp/sbl/sbl.c
C_SRCS += boot/sbl/multiboot.c C_SRCS += boot/sbl/multiboot.c
C_SRCS += boot/sbl/sbl_seed_parse.c C_SRCS += boot/sbl/sbl_seed_parse.c
C_SRCS += boot/sbl/abl_seed_parse.c C_SRCS += boot/sbl/abl_seed_parse.c
TEMPLATE_ACPI_INFO_HEADER := bsp/include/sbl/platform_acpi_info.h
endif endif
endif endif
@ -243,7 +245,6 @@ VERSION := $(HV_OBJDIR)/include/version.h
# Create platform_acpi_info.h # Create platform_acpi_info.h
SOURCE_ACPI_INFO_HEADER := bsp/include/$(CONFIG_BOARD)_acpi_info.h SOURCE_ACPI_INFO_HEADER := bsp/include/$(CONFIG_BOARD)_acpi_info.h
TEMPLATE_ACPI_INFO_HEADER := bsp/include/$(CONFIG_PLATFORM)/platform_acpi_info.h
TARGET_ACPI_INFO_HEADER := $(HV_OBJDIR)/include/platform_acpi_info.h TARGET_ACPI_INFO_HEADER := $(HV_OBJDIR)/include/platform_acpi_info.h
$(TARGET_ACPI_INFO_HEADER): $(HV_OBJDIR)/$(HV_CONFIG) $(TARGET_ACPI_INFO_HEADER): $(HV_OBJDIR)/$(HV_CONFIG)
@ -272,7 +273,7 @@ endif
.PHONY: all .PHONY: all
all: lib $(HV_OBJDIR)/$(HV_FILE).32.out $(HV_OBJDIR)/$(HV_FILE).bin all: lib $(HV_OBJDIR)/$(HV_FILE).32.out $(HV_OBJDIR)/$(HV_FILE).bin
ifeq ($(CONFIG_PLATFORM), uefi) ifeq ($(CONFIG_PLATFORM_UEFI),y)
all: efi all: efi
.PHONY: efi .PHONY: efi
efi: $(HV_OBJDIR)/$(HV_FILE).bin efi: $(HV_OBJDIR)/$(HV_FILE).bin
@ -283,7 +284,7 @@ install: efi
make -C bsp/uefi/efi HV_OBJDIR=$(HV_OBJDIR) install make -C bsp/uefi/efi HV_OBJDIR=$(HV_OBJDIR) install
endif endif
ifeq ($(CONFIG_PLATFORM), sbl) ifeq ($(CONFIG_PLATFORM_SBL),y)
install: $(HV_OBJDIR)/$(HV_FILE).32.out install: $(HV_OBJDIR)/$(HV_FILE).32.out
install -D $(HV_OBJDIR)/$(HV_FILE).32.out $(DESTDIR)/usr/lib/acrn/$(HV_FILE).sbl install -D $(HV_OBJDIR)/$(HV_FILE).32.out $(DESTDIR)/usr/lib/acrn/$(HV_FILE).sbl
endif endif

9
hypervisor/arch/x86/Kconfig
View File

@ -1,8 +1,8 @@
choice choice
prompt "Platform" prompt "Type of boot firmware (BIOS) on the target platform"
default PLATFORM_SBL default PLATFORM_SBL
help help
The BIOS used on the target board. The boot firmware (BIOS) used on the target board.
config PLATFORM_UEFI config PLATFORM_UEFI
bool "UEFI" bool "UEFI"
@ -62,11 +62,6 @@ config IOREQ_POLLING
endchoice endchoice
config PLATFORM
string "The type of boot firmware (BIOS) on the target platform"
default "uefi" if PLATFORM_UEFI
default "sbl" if PLATFORM_SBL
config BOARD config BOARD
string "Target board" string "Target board"
help help