From 300be9df8c15d32c1ccec0d27edf78b5f51e7a36 Mon Sep 17 00:00:00 2001
From: Shuang Zheng <shuang.zheng@intel.com>
Date: Tue, 2 Feb 2021 15:37:47 +0000
Subject: [PATCH] config_tools: update zephyr entry point address on ehl-crb-b

update entry point address for pre-launched zephyr on ehl-crb-b;
update serial console to /dev/ttyS3 on ehl-crb-b.

Tracked-On: #5689

Signed-off-by: Shuang Zheng <shuang.zheng@intel.com>
---
 misc/config_tools/data/ehl-crb-b/fusa_partition.xml    | 6 +++---
 misc/config_tools/data/ehl-crb-b/hybrid.xml            | 8 ++++----
 misc/config_tools/data/ehl-crb-b/hybrid_rt.xml         | 2 +-
 misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml    | 2 +-
 misc/config_tools/data/ehl-crb-b/logical_partition.xml | 2 +-
 misc/config_tools/data/ehl-crb-b/sdc.xml               | 2 +-
 6 files changed, 11 insertions(+), 11 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 93ec44a9b..cdf41509b 100644
--- a/misc/config_tools/data/ehl-crb-b/fusa_partition.xml
+++ b/misc/config_tools/data/ehl-crb-b/fusa_partition.xml
@@ -3,7 +3,7 @@
     <hv>
         <DEBUG_OPTIONS>
             <RELEASE>n</RELEASE>
-            <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
+            <SERIAL_CONSOLE>/dev/ttyS3</SERIAL_CONSOLE>
             <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
             <NPK_LOGLEVEL>5</NPK_LOGLEVEL>
             <CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
@@ -95,8 +95,8 @@
             <kern_mod>Zephyr_RawImage</kern_mod>
             <ramdisk_mod/>
             <bootargs/>
-            <kern_load_addr>0x8000</kern_load_addr>
-            <kern_entry_addr>0x8000</kern_entry_addr>
+            <kern_load_addr>0x1000</kern_load_addr>
+            <kern_entry_addr>0x1000</kern_entry_addr>
         </os_config>
         <legacy_vuart id="0">
             <type>VUART_LEGACY_PIO</type>
diff --git a/misc/config_tools/data/ehl-crb-b/hybrid.xml b/misc/config_tools/data/ehl-crb-b/hybrid.xml
index ea6b0859b..70e662bc5 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid.xml
@@ -3,7 +3,7 @@
     <hv>
         <DEBUG_OPTIONS>
             <RELEASE>n</RELEASE>
-            <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
+            <SERIAL_CONSOLE>/dev/ttyS3</SERIAL_CONSOLE>
             <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
             <NPK_LOGLEVEL>5</NPK_LOGLEVEL>
             <CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
@@ -96,9 +96,9 @@
             <kern_type>KERNEL_ZEPHYR</kern_type>
             <kern_mod>Zephyr_RawImage</kern_mod>
             <ramdisk_mod/>
-            <bootargs>reboot=acpi</bootargs>
-            <kern_load_addr>0x8000</kern_load_addr>
-            <kern_entry_addr>0x8000</kern_entry_addr>
+            <bootargs></bootargs>
+            <kern_load_addr>0x1000</kern_load_addr>
+            <kern_entry_addr>0x1000</kern_entry_addr>
         </os_config>
         <legacy_vuart id="0">
             <type>VUART_LEGACY_PIO</type>
diff --git a/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml b/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml
index 738a672d4..0e4969103 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml
@@ -3,7 +3,7 @@
     <hv>
         <DEBUG_OPTIONS>
             <RELEASE>n</RELEASE>
-            <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
+            <SERIAL_CONSOLE>/dev/ttyS3</SERIAL_CONSOLE>
             <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
             <NPK_LOGLEVEL>5</NPK_LOGLEVEL>
             <CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
diff --git a/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml b/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml
index b51a7443b..cf28fa044 100644
--- a/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml
+++ b/misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml
@@ -3,7 +3,7 @@
     <hv>
         <DEBUG_OPTIONS>
             <RELEASE>n</RELEASE>
-            <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
+            <SERIAL_CONSOLE>/dev/ttyS3</SERIAL_CONSOLE>
             <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
             <NPK_LOGLEVEL>5</NPK_LOGLEVEL>
             <CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
diff --git a/misc/config_tools/data/ehl-crb-b/logical_partition.xml b/misc/config_tools/data/ehl-crb-b/logical_partition.xml
index 4b73b44ad..963a453f1 100644
--- a/misc/config_tools/data/ehl-crb-b/logical_partition.xml
+++ b/misc/config_tools/data/ehl-crb-b/logical_partition.xml
@@ -3,7 +3,7 @@
     <hv>
         <DEBUG_OPTIONS>
             <RELEASE>n</RELEASE>
-            <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
+            <SERIAL_CONSOLE>/dev/ttyS3</SERIAL_CONSOLE>
             <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
             <NPK_LOGLEVEL>5</NPK_LOGLEVEL>
             <CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>
diff --git a/misc/config_tools/data/ehl-crb-b/sdc.xml b/misc/config_tools/data/ehl-crb-b/sdc.xml
index d099ee1cd..02f3a01df 100644
--- a/misc/config_tools/data/ehl-crb-b/sdc.xml
+++ b/misc/config_tools/data/ehl-crb-b/sdc.xml
@@ -3,7 +3,7 @@
     <hv>
         <DEBUG_OPTIONS>
             <RELEASE>n</RELEASE>
-            <SERIAL_CONSOLE>/dev/ttyS0</SERIAL_CONSOLE>
+            <SERIAL_CONSOLE>/dev/ttyS3</SERIAL_CONSOLE>
             <MEM_LOGLEVEL>5</MEM_LOGLEVEL>
             <NPK_LOGLEVEL>5</NPK_LOGLEVEL>
             <CONSOLE_LOGLEVEL>3</CONSOLE_LOGLEVEL>