From 11230765c186577709b0ac26e96171fe1fd88995 Mon Sep 17 00:00:00 2001 From: Kunhui-Li Date: Wed, 17 Nov 2021 11:02:19 +0800 Subject: [PATCH] config_tools: remove LOW_RAM_SIZE remove LOW_RAM_SIZE in the related python code, schema and all existing scenario XMLs because PR #6791 have removed it. Tracked-On: #6805 Signed-off-by: Kunhui-Li --- misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml | 3 +-- misc/config_tools/data/cfl-k700-i7/shared.xml | 3 +-- .../generic_board/generic_code/hybrid/generic_board.config | 1 - .../generic_code/partitioned/generic_board.config | 1 - .../generic_board/generic_code/shared/generic_board.config | 1 - misc/config_tools/data/generic_board/hybrid.xml | 1 - misc/config_tools/data/generic_board/hybrid_rt.xml | 1 - misc/config_tools/data/generic_board/partitioned.xml | 1 - misc/config_tools/data/generic_board/shared.xml | 1 - misc/config_tools/data/nuc11tnbi5/hybrid.xml | 1 - misc/config_tools/data/nuc11tnbi5/partitioned.xml | 1 - misc/config_tools/data/nuc11tnbi5/shared.xml | 1 - misc/config_tools/data/qemu/sdc.xml | 3 +-- misc/config_tools/data/whl-ipc-i5/hybrid.xml | 3 +-- misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml | 3 +-- misc/config_tools/data/whl-ipc-i5/partitioned.xml | 3 +-- misc/config_tools/data/whl-ipc-i5/sdc.xml | 3 +-- misc/config_tools/data/whl-ipc-i5/shared.xml | 3 +-- misc/config_tools/hv_config/board_defconfig.py | 1 - misc/config_tools/hv_config/hv_item.py | 3 --- misc/config_tools/schema/config.xsd | 6 ------ misc/config_tools/xforms/config_common.xsl | 4 ---- 22 files changed, 8 insertions(+), 40 deletions(-) diff --git a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml index a9116549a..33796090d 100644 --- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml +++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml @@ -34,7 +34,6 @@ 0x2000 - 0x00010000 0x800000000 @@ -260,4 +259,4 @@ n - \ No newline at end of file + diff --git a/misc/config_tools/data/cfl-k700-i7/shared.xml b/misc/config_tools/data/cfl-k700-i7/shared.xml index 223ff9ceb..93dd813bc 100644 --- a/misc/config_tools/data/cfl-k700-i7/shared.xml +++ b/misc/config_tools/data/cfl-k700-i7/shared.xml @@ -34,7 +34,6 @@ 0x2000 - 0x00010000 0x800000000 @@ -343,4 +342,4 @@ n - \ No newline at end of file + diff --git a/misc/config_tools/data/generic_board/generic_code/hybrid/generic_board.config b/misc/config_tools/data/generic_board/generic_code/hybrid/generic_board.config index d7804c4a6..345fc9af2 100644 --- a/misc/config_tools/data/generic_board/generic_code/hybrid/generic_board.config +++ b/misc/config_tools/data/generic_board/generic_code/hybrid/generic_board.config @@ -3,7 +3,6 @@ CONFIG_BOARD="generic_board" CONFIG_HV_RAM_START=0x00400000 CONFIG_PLATFORM_RAM_SIZE=0x400000000 -CONFIG_LOW_RAM_SIZE=0x00010000 CONFIG_STACK_SIZE=0x2000 CONFIG_IVSHMEM_ENABLED=n CONFIG_GPU_SBDF=0x00000010 diff --git a/misc/config_tools/data/generic_board/generic_code/partitioned/generic_board.config b/misc/config_tools/data/generic_board/generic_code/partitioned/generic_board.config index 813e328bb..91e866e5d 100644 --- a/misc/config_tools/data/generic_board/generic_code/partitioned/generic_board.config +++ b/misc/config_tools/data/generic_board/generic_code/partitioned/generic_board.config @@ -3,7 +3,6 @@ CONFIG_BOARD="generic_board" CONFIG_HV_RAM_START=0x00400000 CONFIG_PLATFORM_RAM_SIZE=0x400000000 -CONFIG_LOW_RAM_SIZE=0x00010000 CONFIG_STACK_SIZE=0x2000 CONFIG_IVSHMEM_ENABLED=n CONFIG_GPU_SBDF=0x00000010 diff --git a/misc/config_tools/data/generic_board/generic_code/shared/generic_board.config b/misc/config_tools/data/generic_board/generic_code/shared/generic_board.config index d7804c4a6..345fc9af2 100644 --- a/misc/config_tools/data/generic_board/generic_code/shared/generic_board.config +++ b/misc/config_tools/data/generic_board/generic_code/shared/generic_board.config @@ -3,7 +3,6 @@ CONFIG_BOARD="generic_board" CONFIG_HV_RAM_START=0x00400000 CONFIG_PLATFORM_RAM_SIZE=0x400000000 -CONFIG_LOW_RAM_SIZE=0x00010000 CONFIG_STACK_SIZE=0x2000 CONFIG_IVSHMEM_ENABLED=n CONFIG_GPU_SBDF=0x00000010 diff --git a/misc/config_tools/data/generic_board/hybrid.xml b/misc/config_tools/data/generic_board/hybrid.xml index 5b6c0d19f..0ee230630 100644 --- a/misc/config_tools/data/generic_board/hybrid.xml +++ b/misc/config_tools/data/generic_board/hybrid.xml @@ -42,7 +42,6 @@ 0x2000 - 0x00010000 0x400000000 diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml index 753aa0434..80cf09e01 100644 --- a/misc/config_tools/data/generic_board/hybrid_rt.xml +++ b/misc/config_tools/data/generic_board/hybrid_rt.xml @@ -47,7 +47,6 @@ 0x2000 - 0x00010000 0x400000000 diff --git a/misc/config_tools/data/generic_board/partitioned.xml b/misc/config_tools/data/generic_board/partitioned.xml index 7521d71b1..ab44878a3 100644 --- a/misc/config_tools/data/generic_board/partitioned.xml +++ b/misc/config_tools/data/generic_board/partitioned.xml @@ -42,7 +42,6 @@ 0x2000 - 0x00010000 0x400000000 diff --git a/misc/config_tools/data/generic_board/shared.xml b/misc/config_tools/data/generic_board/shared.xml index 57e8edd29..e8d0d7085 100644 --- a/misc/config_tools/data/generic_board/shared.xml +++ b/misc/config_tools/data/generic_board/shared.xml @@ -42,7 +42,6 @@ 0x2000 - 0x00010000 0x400000000 diff --git a/misc/config_tools/data/nuc11tnbi5/hybrid.xml b/misc/config_tools/data/nuc11tnbi5/hybrid.xml index 2d78d2f1d..59b769d03 100644 --- a/misc/config_tools/data/nuc11tnbi5/hybrid.xml +++ b/misc/config_tools/data/nuc11tnbi5/hybrid.xml @@ -42,7 +42,6 @@ 0x2000 - 0x00010000 0x400000000 diff --git a/misc/config_tools/data/nuc11tnbi5/partitioned.xml b/misc/config_tools/data/nuc11tnbi5/partitioned.xml index 8bd194a9b..8f27884a8 100644 --- a/misc/config_tools/data/nuc11tnbi5/partitioned.xml +++ b/misc/config_tools/data/nuc11tnbi5/partitioned.xml @@ -42,7 +42,6 @@ 0x2000 - 0x00010000 0x400000000 diff --git a/misc/config_tools/data/nuc11tnbi5/shared.xml b/misc/config_tools/data/nuc11tnbi5/shared.xml index 4d6bf75ae..ca1aad25b 100644 --- a/misc/config_tools/data/nuc11tnbi5/shared.xml +++ b/misc/config_tools/data/nuc11tnbi5/shared.xml @@ -42,7 +42,6 @@ 0x2000 - 0x00010000 0x400000000 diff --git a/misc/config_tools/data/qemu/sdc.xml b/misc/config_tools/data/qemu/sdc.xml index bb9562470..ef269c2b7 100644 --- a/misc/config_tools/data/qemu/sdc.xml +++ b/misc/config_tools/data/qemu/sdc.xml @@ -35,7 +35,6 @@ 0x2000 0x11000000 - 0x00010000 0x100000000 @@ -140,4 +139,4 @@ 1 - \ No newline at end of file + diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml index 85cab0a42..f545b7c94 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml @@ -34,7 +34,6 @@ 0x2000 - 0x00010000 0x400000000 @@ -203,4 +202,4 @@ n - \ No newline at end of file + diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml index 146877279..ab19bf2ae 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml @@ -34,7 +34,6 @@ 0x2000 - 0x00010000 0x400000000 @@ -248,4 +247,4 @@ n - \ No newline at end of file + diff --git a/misc/config_tools/data/whl-ipc-i5/partitioned.xml b/misc/config_tools/data/whl-ipc-i5/partitioned.xml index db5ec8ec0..1d1921ea9 100644 --- a/misc/config_tools/data/whl-ipc-i5/partitioned.xml +++ b/misc/config_tools/data/whl-ipc-i5/partitioned.xml @@ -34,7 +34,6 @@ 0x2000 - 0x00010000 0x400000000 @@ -176,4 +175,4 @@ n - \ No newline at end of file + diff --git a/misc/config_tools/data/whl-ipc-i5/sdc.xml b/misc/config_tools/data/whl-ipc-i5/sdc.xml index 314c58b7b..71c6ec485 100644 --- a/misc/config_tools/data/whl-ipc-i5/sdc.xml +++ b/misc/config_tools/data/whl-ipc-i5/sdc.xml @@ -34,7 +34,6 @@ 0x2000 - 0x00010000 0x400000000 @@ -142,4 +141,4 @@ n - \ No newline at end of file + diff --git a/misc/config_tools/data/whl-ipc-i5/shared.xml b/misc/config_tools/data/whl-ipc-i5/shared.xml index b0305fcb9..3cd3c1b89 100644 --- a/misc/config_tools/data/whl-ipc-i5/shared.xml +++ b/misc/config_tools/data/whl-ipc-i5/shared.xml @@ -34,7 +34,6 @@ 0x2000 - 0x00010000 0x400000000 @@ -342,4 +341,4 @@ n - \ No newline at end of file + diff --git a/misc/config_tools/hv_config/board_defconfig.py b/misc/config_tools/hv_config/board_defconfig.py index a0f43a48a..f4200e5ae 100644 --- a/misc/config_tools/hv_config/board_defconfig.py +++ b/misc/config_tools/hv_config/board_defconfig.py @@ -109,7 +109,6 @@ def get_memory(hv_info, config): print("CONFIG_HV_RAM_START={}".format(hv_info.mem.hv_ram_start), file=config) print("CONFIG_PLATFORM_RAM_SIZE={}".format(hv_info.mem.platform_ram_size), file=config) - print("CONFIG_LOW_RAM_SIZE={}".format(hv_info.mem.low_ram_size), file=config) print("CONFIG_STACK_SIZE={}".format(hv_info.mem.stack_size), file=config) print("CONFIG_IVSHMEM_ENABLED={}".format(hv_info.mem.ivshmem_enable), file=config) diff --git a/misc/config_tools/hv_config/hv_item.py b/misc/config_tools/hv_config/hv_item.py index 1cb2b4b19..59ba18243 100644 --- a/misc/config_tools/hv_config/hv_item.py +++ b/misc/config_tools/hv_config/hv_item.py @@ -148,7 +148,6 @@ class Memory: def __init__(self, hv_file): self.hv_file = hv_file self.stack_size = 0 - self.low_ram_size = 0 self.hv_ram_start = 0 self.platform_ram_size = 0 self.sos_ram_size = 0 @@ -158,7 +157,6 @@ class Memory: def get_info(self): self.stack_size = common.get_hv_item_tag(self.hv_file, "MEMORY", "STACK_SIZE") - self.low_ram_size = common.get_hv_item_tag(self.hv_file, "MEMORY", "LOW_RAM_SIZE") self.hv_ram_start = common.get_hv_item_tag(self.hv_file, "MEMORY", "HV_RAM_START") self.platform_ram_size = common.get_hv_item_tag(self.hv_file, "MEMORY", "PLATFORM_RAM_SIZE") self.ivshmem_enable = common.get_hv_item_tag(self.hv_file, "FEATURES", "IVSHMEM", "IVSHMEM_ENABLED") @@ -166,7 +164,6 @@ class Memory: def check_item(self): hv_cfg_lib.hv_size_check(self.stack_size, "MEMORY", "STACK_SIZE") - hv_cfg_lib.hv_size_check(self.low_ram_size, "MEMORY", "LOW_RAM_SIZE") hv_cfg_lib.hv_ram_start_check(self.hv_ram_start, "MEMORY", "HV_RAM_START") hv_cfg_lib.hv_size_check(self.platform_ram_size, "MEMORY", "PLATFORM_RAM_SIZE") hv_cfg_lib.ny_support_check(self.ivshmem_enable, "FEATURES", "IVSHMEM", "IVSHMEM_ENABLED") diff --git a/misc/config_tools/schema/config.xsd b/misc/config_tools/schema/config.xsd index 710db5118..6cae7d0ee 100644 --- a/misc/config_tools/schema/config.xsd +++ b/misc/config_tools/schema/config.xsd @@ -201,12 +201,6 @@ three for specific exceptions. the RAM region used by the hypervisor. - - - Size of the low RAM region below address -``0x10000``, starting from address ``0x0``. - - Size of the physical platform RAM. Default diff --git a/misc/config_tools/xforms/config_common.xsl b/misc/config_tools/xforms/config_common.xsl index 2f49413b0..92c4fa357 100644 --- a/misc/config_tools/xforms/config_common.xsl +++ b/misc/config_tools/xforms/config_common.xsl @@ -149,10 +149,6 @@ - - - -