config-tool: refine guest kernel types

Rename KERNEL_ZEPHYR to KERNEL_RAWIMAGE. Added new type "KERNEL_ELF".

Add CONFIG_GUEST_KERNEL_RAWIMAGE, CONFIG_GUEST_KERNEL_ELF and/or
CONFIG_GUEST_KERNEL_BZIMAGE to config.h if it's configured.

Tracked-On: #6323

Signed-off-by: Yang,Yu-chu <yu-chu.yang@intel.com>
Reviewed-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
Yang,Yu-chu
2021-07-27 10:56:56 -07:00
committed by wenlingz
parent 178b3e85e3
commit 73dc610d90
11 changed files with 22 additions and 14 deletions

View File

@@ -13,7 +13,7 @@ NATIVE_TTYS_DIC = {}
START_HPA_LIST = ['0', '0x100000000', '0x120000000']
KERN_TYPE_LIST = ['KERNEL_BZIMAGE', 'KERNEL_ZEPHYR']
KERN_TYPE_LIST = ['KERNEL_BZIMAGE', 'KERNEL_RAWIMAGE', 'KERNEL_ELF']
KERN_BOOT_ADDR_LIST = ['0x100000']
VUART_TYPE = ['VUART_LEGACY_PIO', 'VUART_PCI']
@@ -515,7 +515,7 @@ def os_kern_load_addr_check(kern_type, id_kern_load_addr_dic, prime_item, item):
"""
for id_key, kern_load_addr in id_kern_load_addr_dic.items():
if kern_type[id_key] != 'KERNEL_ZEPHYR':
if kern_type[id_key] != 'KERNEL_RAWIMAGE':
continue
if not kern_load_addr:
@@ -537,7 +537,7 @@ def os_kern_entry_addr_check(kern_type, id_kern_entry_addr_dic, prime_item, item
"""
for id_key, kern_entry_addr in id_kern_entry_addr_dic.items():
if kern_type[id_key] != 'KERNEL_ZEPHYR':
if kern_type[id_key] != 'KERNEL_RAWIMAGE':
continue
if not kern_entry_addr: