From 6a9319b685cec55905f3ee2b0db9ff5df6d2bd68 Mon Sep 17 00:00:00 2001
From: Wei Liu <weix.w.liu@intel.com>
Date: Wed, 4 Mar 2020 09:34:17 +0800
Subject: [PATCH] acrn-config: dump iomem info from /proc/iomem

Need more information from iomem, so dump all the iomem information
from /proc/iomem to instead of system ram information.

Tracked-On: #4569
Signed-off-by: Wei Liu <weix.w.liu@intel.com>
Acked-by: Victor Sun <victor.sun@intel.com>
Acked-by: Terry Zou <terry.zou@intel.com>
---
 misc/acrn-config/board_config/new_board_kconfig.py |  9 ++++++---
 misc/acrn-config/target/misc.py                    | 10 ++++------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/misc/acrn-config/board_config/new_board_kconfig.py b/misc/acrn-config/board_config/new_board_kconfig.py
index 390b9821e..273475bd2 100644
--- a/misc/acrn-config/board_config/new_board_kconfig.py
+++ b/misc/acrn-config/board_config/new_board_kconfig.py
@@ -61,9 +61,12 @@ def get_ram_range():
     # read system ram from board_info.xml
     ram_range = {}
 
-    sys_mem_lines = board_cfg_lib.get_info(
-        board_cfg_lib.BOARD_INFO_FILE, "<SYSTEM_RAM_INFO>", "</SYSTEM_RAM_INFO>")
-    for line in sys_mem_lines:
+    io_mem_lines = board_cfg_lib.get_info(
+        board_cfg_lib.BOARD_INFO_FILE, "<IOMEM_INFO>", "</IOMEM_INFO>")
+
+    for line in io_mem_lines:
+        if 'System RAM' not in line:
+            continue
         start_addr = int(line.split('-')[0], 16)
         end_addr = int(line.split('-')[1].split(':')[0], 16)
         mem_range = end_addr - start_addr
diff --git a/misc/acrn-config/target/misc.py b/misc/acrn-config/target/misc.py
index 36212fc5d..8bc6b7422 100644
--- a/misc/acrn-config/target/misc.py
+++ b/misc/acrn-config/target/misc.py
@@ -145,19 +145,17 @@ def dump_system_ram(config):
     """This will get systemd ram which are usable
     :param config: file pointer that opened for writing board config information
     """
-    print("\t<SYSTEM_RAM_INFO>", file=config)
+    print("\t<IOMEM_INFO>", file=config)
     with open(MEM_PATH[0], 'rt') as mem_info:
 
         while True:
-            line = mem_info.readline().strip()
+            line = mem_info.readline().strip('\n')
             if not line:
                 break
 
-            pat_type = line.split(':')[1].strip()
-            if pat_type == "System RAM":
-                print("\t{}".format(line), file=config)
+            print("\t{}".format(line), file=config)
 
-    print("\t</SYSTEM_RAM_INFO>", file=config)
+    print("\t</IOMEM_INFO>", file=config)
     print("", file=config)