diff --git a/misc/acrn-config/board_config/ve820_c.py b/misc/acrn-config/board_config/ve820_c.py
index 56680b362..e77505be1 100644
--- a/misc/acrn-config/board_config/ve820_c.py
+++ b/misc/acrn-config/board_config/ve820_c.py
@@ -45,8 +45,12 @@ def ve820_per_launch(config, hpa_size, hpa2_size):
low_mem_hpa_len.append(511 * 1024 * 1024)
high_mem_hpa_len.append(int(hpa_size[i], 16) - 512 * 1024 * 1024)
- #HPA2 is always allocated in >4G space.
- high_mem_hpa2_len.append(int(hpa2_size[i], 16))
+ if len(hpa2_size) == 0:
+ high_mem_hpa2_len.append(0)
+ else:
+ high_mem_hpa2_len.append(int(hpa2_size[i], 16))
+
+ #HPA2 is always allocated in >4G space.
if (high_mem_hpa_len[i] != 0) and (high_mem_hpa2_len[i] != 0):
high_mem_hpa2_addr.append(FOUR_GBYTE + high_mem_hpa_len[i])
else:
diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml
index f4d5b7cdc..5d7002bc9 100644
--- a/misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml
+++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/hybrid.xml
@@ -17,6 +17,8 @@
0x100000000
0x20000000
+ 0x0
+ 0x0
Zephyr
diff --git a/misc/acrn-config/xmls/config-xmls/apl-mrb/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/apl-mrb/logical_partition.xml
index 9a1f1c810..dfe8bb0f9 100644
--- a/misc/acrn-config/xmls/config-xmls/apl-mrb/logical_partition.xml
+++ b/misc/acrn-config/xmls/config-xmls/apl-mrb/logical_partition.xml
@@ -18,6 +18,8 @@
0x100000000
0x20000000
+ 0x0
+ 0x0
ClearLinux
@@ -65,6 +67,8 @@
0x120000000
VM0_MEM_SIZE
+ 0x0
+ 0x0
ClearLinux
diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/logical_partition.xml
index b46f22712..a2ee9bdc5 100644
--- a/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/logical_partition.xml
+++ b/misc/acrn-config/xmls/config-xmls/apl-up2-n3350/logical_partition.xml
@@ -18,6 +18,8 @@
0x100000000
0x20000000
+ 0x0
+ 0x0
ClearLinux
@@ -64,6 +66,8 @@
0x120000000
VM0_MEM_SIZE
+ 0x0
+ 0x0
ClearLinux
diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml b/misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml
index 354685b4a..bf5649575 100644
--- a/misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml
+++ b/misc/acrn-config/xmls/config-xmls/apl-up2/hybrid.xml
@@ -17,6 +17,8 @@
0x100000000
0x20000000
+ 0x0
+ 0x0
Zephyr
diff --git a/misc/acrn-config/xmls/config-xmls/apl-up2/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/apl-up2/logical_partition.xml
index 3e2e7d7c5..b4cf42f7d 100644
--- a/misc/acrn-config/xmls/config-xmls/apl-up2/logical_partition.xml
+++ b/misc/acrn-config/xmls/config-xmls/apl-up2/logical_partition.xml
@@ -19,6 +19,8 @@
0x100000000
0x20000000
+ 0x0
+ 0x0
ClearLinux
@@ -66,6 +68,8 @@
0x120000000
VM0_MEM_SIZE
+ 0x0
+ 0x0
ClearLinux
diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml
index ebc5311d3..3a4272f7d 100644
--- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml
+++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/hybrid.xml
@@ -17,6 +17,8 @@
0x100000000
0x20000000
+ 0x0
+ 0x0
Zephyr
diff --git a/misc/acrn-config/xmls/config-xmls/nuc6cayh/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/nuc6cayh/logical_partition.xml
index 8070d97cf..f033df718 100644
--- a/misc/acrn-config/xmls/config-xmls/nuc6cayh/logical_partition.xml
+++ b/misc/acrn-config/xmls/config-xmls/nuc6cayh/logical_partition.xml
@@ -19,6 +19,8 @@
0x100000000
0x20000000
+ 0x0
+ 0x0
ClearLinux
@@ -66,6 +68,8 @@
0x120000000
VM0_MEM_SIZE
+ 0x0
+ 0x0
ClearLinux
diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml
index 570522b6e..d0f448b5c 100644
--- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml
+++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/hybrid.xml
@@ -17,6 +17,8 @@
0x100000000
0x20000000
+ 0x0
+ 0x0
Zephyr
diff --git a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/logical_partition.xml
index 1e8c86135..c9cc6bff5 100644
--- a/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/logical_partition.xml
+++ b/misc/acrn-config/xmls/config-xmls/nuc7i7dnb/logical_partition.xml
@@ -19,6 +19,8 @@
0x100000000
0x20000000
+ 0x0
+ 0x0
ClearLinux
@@ -66,6 +68,8 @@
0x120000000
VM0_MEM_SIZE
+ 0x0
+ 0x0
ClearLinux
diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid.xml
index 0bd9fe545..a593c74d2 100644
--- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid.xml
+++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/hybrid.xml
@@ -17,6 +17,8 @@
0x100000000
0x20000000
+ 0x0
+ 0x0
Zephyr
diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/logical_partition.xml
index 59ebf964a..a369b128d 100644
--- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/logical_partition.xml
+++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i5/logical_partition.xml
@@ -19,6 +19,8 @@
0x100000000
0x20000000
+ 0x0
+ 0x0
ClearLinux
@@ -66,6 +68,8 @@
0x120000000
VM0_MEM_SIZE
+ 0x0
+ 0x0
ClearLinux
diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid.xml
index 1e7af8ece..54106be29 100644
--- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid.xml
+++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/hybrid.xml
@@ -17,6 +17,8 @@
0x100000000
0x20000000
+ 0x0
+ 0x0
Zephyr
diff --git a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/logical_partition.xml b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/logical_partition.xml
index e1e432089..6198120ed 100644
--- a/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/logical_partition.xml
+++ b/misc/acrn-config/xmls/config-xmls/whl-ipc-i7/logical_partition.xml
@@ -19,6 +19,8 @@
0x100000000
0x20000000
+ 0x0
+ 0x0
ClearLinux
@@ -66,6 +68,8 @@
0x120000000
VM0_MEM_SIZE
+ 0x0
+ 0x0
ClearLinux