HV: Change hybrid.xml default zephyr config to KERNEL_ELF

In the default config file for hybrid scenario, zephyr image was
configured as KERNEL_RAWIMAGE. Now we change them to KERNEL_ELF
for all the platforms. And also kernel mods are changed from
Zephyr_RawImage to Zephyr_ElfImage

Tracked-On: #6323

Signed-off-by: Zhou, Wu <wu.zhou@intel.com>
Reviewed-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
Zhou, Wu 2021-08-09 11:34:39 +08:00 committed by wenlingz
parent b394777908
commit 2e2730137f
8 changed files with 16 additions and 16 deletions

View File

@ -95,8 +95,8 @@
</memory> </memory>
<os_config> <os_config>
<name>Zephyr</name> <name>Zephyr</name>
<kern_type>KERNEL_RAWIMAGE</kern_type> <kern_type>KERNEL_ELF</kern_type>
<kern_mod>Zephyr_RawImage</kern_mod> <kern_mod>Zephyr_ElfImage</kern_mod>
<ramdisk_mod/> <ramdisk_mod/>
<bootargs/> <bootargs/>
<kern_load_addr>0x1000</kern_load_addr> <kern_load_addr>0x1000</kern_load_addr>

View File

@ -95,8 +95,8 @@
</memory> </memory>
<os_config> <os_config>
<name>Zephyr</name> <name>Zephyr</name>
<kern_type>KERNEL_RAWIMAGE</kern_type> <kern_type>KERNEL_ELF</kern_type>
<kern_mod>Zephyr_RawImage</kern_mod> <kern_mod>Zephyr_ElfImage</kern_mod>
<ramdisk_mod/> <ramdisk_mod/>
<bootargs></bootargs> <bootargs></bootargs>
<kern_load_addr>0x1000</kern_load_addr> <kern_load_addr>0x1000</kern_load_addr>

View File

@ -85,8 +85,8 @@
</memory> </memory>
<os_config> <os_config>
<name>Zephyr</name> <name>Zephyr</name>
<kern_type>KERNEL_ZEPHYR</kern_type> <kern_type>KERNEL_ELF</kern_type>
<kern_mod>Zephyr_RawImage</kern_mod> <kern_mod>Zephyr_ElfImage</kern_mod>
<ramdisk_mod></ramdisk_mod> <ramdisk_mod></ramdisk_mod>
<bootargs/> <bootargs/>
<kern_load_addr>0x8000</kern_load_addr> <kern_load_addr>0x8000</kern_load_addr>

View File

@ -85,8 +85,8 @@
</memory> </memory>
<os_config> <os_config>
<name>Zephyr</name> <name>Zephyr</name>
<kern_type>KERNEL_RAWIMAGE</kern_type> <kern_type>KERNEL_ELF</kern_type>
<kern_mod>Zephyr_RawImage</kern_mod> <kern_mod>Zephyr_ElfImage</kern_mod>
<ramdisk_mod></ramdisk_mod> <ramdisk_mod></ramdisk_mod>
<bootargs/> <bootargs/>
<kern_load_addr>0x8000</kern_load_addr> <kern_load_addr>0x8000</kern_load_addr>

View File

@ -82,8 +82,8 @@
</memory> </memory>
<os_config> <os_config>
<name>Zephyr</name> <name>Zephyr</name>
<kern_type>KERNEL_RAWIMAGE</kern_type> <kern_type>KERNEL_ELF</kern_type>
<kern_mod>Zephyr_RawImage</kern_mod> <kern_mod>Zephyr_ElfImage</kern_mod>
<ramdisk_mod/> <ramdisk_mod/>
<bootargs>reboot=acpi</bootargs> <bootargs>reboot=acpi</bootargs>
<kern_load_addr>0x8000</kern_load_addr> <kern_load_addr>0x8000</kern_load_addr>

View File

@ -90,8 +90,8 @@
</memory> </memory>
<os_config> <os_config>
<name>Zephyr</name> <name>Zephyr</name>
<kern_type>KERNEL_RAWIMAGE</kern_type> <kern_type>KERNEL_ELF</kern_type>
<kern_mod>Zephyr_RawImage</kern_mod> <kern_mod>Zephyr_ElfImage</kern_mod>
<ramdisk_mod/> <ramdisk_mod/>
<bootargs>reboot=acpi</bootargs> <bootargs>reboot=acpi</bootargs>
<kern_load_addr>0x8000</kern_load_addr> <kern_load_addr>0x8000</kern_load_addr>

View File

@ -82,8 +82,8 @@
</memory> </memory>
<os_config> <os_config>
<name>Zephyr</name> <name>Zephyr</name>
<kern_type>KERNEL_RAWIMAGE</kern_type> <kern_type>KERNEL_ELF</kern_type>
<kern_mod>Zephyr_RawImage</kern_mod> <kern_mod>Zephyr_ElfImage</kern_mod>
<ramdisk_mod/> <ramdisk_mod/>
<bootargs>reboot=acpi</bootargs> <bootargs>reboot=acpi</bootargs>
<kern_load_addr>0x8000</kern_load_addr> <kern_load_addr>0x8000</kern_load_addr>

View File

@ -82,8 +82,8 @@
</memory> </memory>
<os_config> <os_config>
<name>Zephyr</name> <name>Zephyr</name>
<kern_type>KERNEL_RAWIMAGE</kern_type> <kern_type>KERNEL_ELF</kern_type>
<kern_mod>Zephyr_RawImage</kern_mod> <kern_mod>Zephyr_ElfImage</kern_mod>
<ramdisk_mod/> <ramdisk_mod/>
<bootargs>reboot=acpi</bootargs> <bootargs>reboot=acpi</bootargs>
<kern_load_addr>0x8000</kern_load_addr> <kern_load_addr>0x8000</kern_load_addr>