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:
parent
4702e743a8
commit
03fa036642
|
@ -109,7 +109,6 @@ struct vuart_config {
|
|||
|
||||
enum os_kernel_type {
|
||||
KERNEL_BZIMAGE = 1,
|
||||
KERNEL_ZEPHYR,
|
||||
KERNEL_RAWIMAGE,
|
||||
KERNEL_ELF,
|
||||
KERNEL_UNKNOWN,
|
||||
|
|
|
@ -95,7 +95,7 @@
|
|||
</memory>
|
||||
<os_config>
|
||||
<name>Zephyr</name>
|
||||
<kern_type>KERNEL_ZEPHYR</kern_type>
|
||||
<kern_type>KERNEL_RAWIMAGE</kern_type>
|
||||
<kern_mod>Zephyr_RawImage</kern_mod>
|
||||
<ramdisk_mod/>
|
||||
<bootargs/>
|
||||
|
|
|
@ -95,7 +95,7 @@
|
|||
</memory>
|
||||
<os_config>
|
||||
<name>Zephyr</name>
|
||||
<kern_type>KERNEL_ZEPHYR</kern_type>
|
||||
<kern_type>KERNEL_RAWIMAGE</kern_type>
|
||||
<kern_mod>Zephyr_RawImage</kern_mod>
|
||||
<ramdisk_mod/>
|
||||
<bootargs></bootargs>
|
||||
|
|
|
@ -85,7 +85,7 @@
|
|||
</memory>
|
||||
<os_config>
|
||||
<name>Zephyr</name>
|
||||
<kern_type>KERNEL_ZEPHYR</kern_type>
|
||||
<kern_type>KERNEL_RAWIMAGE</kern_type>
|
||||
<kern_mod>Zephyr_RawImage</kern_mod>
|
||||
<ramdisk_mod></ramdisk_mod>
|
||||
<bootargs/>
|
||||
|
|
|
@ -82,7 +82,7 @@
|
|||
</memory>
|
||||
<os_config>
|
||||
<name>Zephyr</name>
|
||||
<kern_type>KERNEL_ZEPHYR</kern_type>
|
||||
<kern_type>KERNEL_RAWIMAGE</kern_type>
|
||||
<kern_mod>Zephyr_RawImage</kern_mod>
|
||||
<ramdisk_mod/>
|
||||
<bootargs>reboot=acpi</bootargs>
|
||||
|
|
|
@ -90,7 +90,7 @@
|
|||
</memory>
|
||||
<os_config>
|
||||
<name>Zephyr</name>
|
||||
<kern_type>KERNEL_ZEPHYR</kern_type>
|
||||
<kern_type>KERNEL_RAWIMAGE</kern_type>
|
||||
<kern_mod>Zephyr_RawImage</kern_mod>
|
||||
<ramdisk_mod/>
|
||||
<bootargs>reboot=acpi</bootargs>
|
||||
|
|
|
@ -82,7 +82,7 @@
|
|||
</memory>
|
||||
<os_config>
|
||||
<name>Zephyr</name>
|
||||
<kern_type>KERNEL_ZEPHYR</kern_type>
|
||||
<kern_type>KERNEL_RAWIMAGE</kern_type>
|
||||
<kern_mod>Zephyr_RawImage</kern_mod>
|
||||
<ramdisk_mod/>
|
||||
<bootargs>reboot=acpi</bootargs>
|
||||
|
|
|
@ -82,7 +82,7 @@
|
|||
</memory>
|
||||
<os_config>
|
||||
<name>Zephyr</name>
|
||||
<kern_type>KERNEL_ZEPHYR</kern_type>
|
||||
<kern_type>KERNEL_RAWIMAGE</kern_type>
|
||||
<kern_mod>Zephyr_RawImage</kern_mod>
|
||||
<ramdisk_mod/>
|
||||
<bootargs>reboot=acpi</bootargs>
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -194,12 +194,13 @@ must exactly match the module tag in the GRUB multiboot cmdline.</xs:documentati
|
|||
|
||||
<xs:simpleType name="VMKernelType">
|
||||
<xs:annotation>
|
||||
<xs:documentation>A string with either ``KERNEL_BZIMAGE`` or
|
||||
``KERNEL_ZEPHYR``.</xs:documentation>
|
||||
<xs:documentation>A string with either ``KERNEL_BZIMAGE``, ``KERNEL_ELF`` or
|
||||
``KERNEL_RAWIMAGE``.</xs:documentation>
|
||||
</xs:annotation>
|
||||
<xs:restriction base="xs:string">
|
||||
<xs:enumeration value="KERNEL_BZIMAGE" />
|
||||
<xs:enumeration value="KERNEL_ZEPHYR" />
|
||||
<xs:enumeration value="KERNEL_RAWIMAGE" />
|
||||
<xs:enumeration value="KERNEL_ELF" />
|
||||
</xs:restriction>
|
||||
</xs:simpleType>
|
||||
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
<xsl:apply-templates select="hv/MEMORY" />
|
||||
<xsl:apply-templates select="hv/CAPACITIES" />
|
||||
<xsl:apply-templates select="hv/MISC_CFG" />
|
||||
<xsl:apply-templates select="vm/os_config/kern_type" />
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="DEBUG_OPTIONS">
|
||||
|
@ -282,6 +283,13 @@
|
|||
</xsl:choose>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template match="kern_type">
|
||||
<xsl:call-template name="boolean-by-key-value">
|
||||
<xsl:with-param name="key" select="concat('GUEST_', current())" />
|
||||
<xsl:with-param name="value" select="'y'" />
|
||||
</xsl:call-template>
|
||||
</xsl:template>
|
||||
|
||||
<xsl:template name="hex-to-bin">
|
||||
<xsl:param name="s" />
|
||||
<xsl:param name="width" />
|
||||
|
|
Loading…
Reference in New Issue