From 2e2730137f083413bb69c23584b5d50880ac7fa8 Mon Sep 17 00:00:00 2001
From: "Zhou, Wu" <wu.zhou@intel.com>
Date: Mon, 9 Aug 2021 11:34:39 +0800
Subject: [PATCH] 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>
---
 misc/config_tools/data/ehl-crb-b/fusa_partition.xml | 4 ++--
 misc/config_tools/data/ehl-crb-b/hybrid.xml         | 4 ++--
 misc/config_tools/data/generic_board/hybrid.xml     | 4 ++--
 misc/config_tools/data/nuc11tnbi5/hybrid.xml        | 4 ++--
 misc/config_tools/data/nuc7i7dnb/hybrid.xml         | 4 ++--
 misc/config_tools/data/tgl-rvp/hybrid.xml           | 4 ++--
 misc/config_tools/data/whl-ipc-i5/hybrid.xml        | 4 ++--
 misc/config_tools/data/whl-ipc-i7/hybrid.xml        | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/misc/config_tools/data/ehl-crb-b/fusa_partition.xml b/misc/config_tools/data/ehl-crb-b/fusa_partition.xml
index c0f814d52..37cb0828a 100644
--- a/misc/config_tools/data/ehl-crb-b/fusa_partition.xml
+++ b/misc/config_tools/data/ehl-crb-b/fusa_partition.xml
@@ -95,8 +95,8 @@
         </memory>
         <os_config>
             <name>Zephyr</name>
-            <kern_type>KERNEL_RAWIMAGE</kern_type>
-            <kern_mod>Zephyr_RawImage</kern_mod>
+            <kern_type>KERNEL_ELF</kern_type>
+            <kern_mod>Zephyr_ElfImage</kern_mod>
             <ramdisk_mod/>
             <bootargs/>
             <kern_load_addr>0x1000</kern_load_addr>
diff --git a/misc/config_tools/data/ehl-crb-b/hybrid.xml b/misc/config_tools/data/ehl-crb-b/hybrid.xml
index 3603d9e58..a5706a42c 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid.xml
@@ -95,8 +95,8 @@
         </memory>
         <os_config>
             <name>Zephyr</name>
-            <kern_type>KERNEL_RAWIMAGE</kern_type>
-            <kern_mod>Zephyr_RawImage</kern_mod>
+            <kern_type>KERNEL_ELF</kern_type>
+            <kern_mod>Zephyr_ElfImage</kern_mod>
             <ramdisk_mod/>
             <bootargs></bootargs>
             <kern_load_addr>0x1000</kern_load_addr>
diff --git a/misc/config_tools/data/generic_board/hybrid.xml b/misc/config_tools/data/generic_board/hybrid.xml
index d6e9e9ed2..46f68fccb 100644
--- a/misc/config_tools/data/generic_board/hybrid.xml
+++ b/misc/config_tools/data/generic_board/hybrid.xml
@@ -85,8 +85,8 @@
     </memory>
     <os_config>
       <name>Zephyr</name>
-      <kern_type>KERNEL_ZEPHYR</kern_type>
-      <kern_mod>Zephyr_RawImage</kern_mod>
+      <kern_type>KERNEL_ELF</kern_type>
+      <kern_mod>Zephyr_ElfImage</kern_mod>
       <ramdisk_mod></ramdisk_mod>
       <bootargs/>
       <kern_load_addr>0x8000</kern_load_addr>
diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid.xml b/misc/config_tools/data/nuc11tnbi5/hybrid.xml
index ba8f5c1a3..9ce4384d8 100644
--- a/misc/config_tools/data/nuc11tnbi5/hybrid.xml
+++ b/misc/config_tools/data/nuc11tnbi5/hybrid.xml
@@ -85,8 +85,8 @@
     </memory>
     <os_config>
       <name>Zephyr</name>
-      <kern_type>KERNEL_RAWIMAGE</kern_type>
-      <kern_mod>Zephyr_RawImage</kern_mod>
+      <kern_type>KERNEL_ELF</kern_type>
+      <kern_mod>Zephyr_ElfImage</kern_mod>
       <ramdisk_mod></ramdisk_mod>
       <bootargs/>
       <kern_load_addr>0x8000</kern_load_addr>
diff --git a/misc/config_tools/data/nuc7i7dnb/hybrid.xml b/misc/config_tools/data/nuc7i7dnb/hybrid.xml
index 036cff189..adc210983 100644
--- a/misc/config_tools/data/nuc7i7dnb/hybrid.xml
+++ b/misc/config_tools/data/nuc7i7dnb/hybrid.xml
@@ -82,8 +82,8 @@
     </memory>
     <os_config>
         <name>Zephyr</name>
-        <kern_type>KERNEL_RAWIMAGE</kern_type>
-        <kern_mod>Zephyr_RawImage</kern_mod>
+        <kern_type>KERNEL_ELF</kern_type>
+        <kern_mod>Zephyr_ElfImage</kern_mod>
         <ramdisk_mod/>
         <bootargs>reboot=acpi</bootargs>
         <kern_load_addr>0x8000</kern_load_addr>
diff --git a/misc/config_tools/data/tgl-rvp/hybrid.xml b/misc/config_tools/data/tgl-rvp/hybrid.xml
index 36fa85221..f0038e06c 100644
--- a/misc/config_tools/data/tgl-rvp/hybrid.xml
+++ b/misc/config_tools/data/tgl-rvp/hybrid.xml
@@ -90,8 +90,8 @@
     </memory>
     <os_config>
         <name>Zephyr</name>
-        <kern_type>KERNEL_RAWIMAGE</kern_type>
-        <kern_mod>Zephyr_RawImage</kern_mod>
+        <kern_type>KERNEL_ELF</kern_type>
+        <kern_mod>Zephyr_ElfImage</kern_mod>
         <ramdisk_mod/>
         <bootargs>reboot=acpi</bootargs>
         <kern_load_addr>0x8000</kern_load_addr>
diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
index 8a6b3274b..6abdc2744 100644
--- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml
+++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml
@@ -82,8 +82,8 @@
     </memory>
     <os_config>
         <name>Zephyr</name>
-        <kern_type>KERNEL_RAWIMAGE</kern_type>
-        <kern_mod>Zephyr_RawImage</kern_mod>
+        <kern_type>KERNEL_ELF</kern_type>
+        <kern_mod>Zephyr_ElfImage</kern_mod>
         <ramdisk_mod/>
         <bootargs>reboot=acpi</bootargs>
         <kern_load_addr>0x8000</kern_load_addr>
diff --git a/misc/config_tools/data/whl-ipc-i7/hybrid.xml b/misc/config_tools/data/whl-ipc-i7/hybrid.xml
index 101bff0b4..7296cb44b 100644
--- a/misc/config_tools/data/whl-ipc-i7/hybrid.xml
+++ b/misc/config_tools/data/whl-ipc-i7/hybrid.xml
@@ -82,8 +82,8 @@
     </memory>
     <os_config>
         <name>Zephyr</name>
-        <kern_type>KERNEL_RAWIMAGE</kern_type>
-        <kern_mod>Zephyr_RawImage</kern_mod>
+        <kern_type>KERNEL_ELF</kern_type>
+        <kern_mod>Zephyr_ElfImage</kern_mod>
         <ramdisk_mod/>
         <bootargs>reboot=acpi</bootargs>
         <kern_load_addr>0x8000</kern_load_addr>