github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-23 14:07:42 +00:00
Code Issues Projects Releases Wiki Activity

config_tools: remove UOS_RAM_SIZE and SOS_RAM_SIZE in scenario config

Browse Source 
remove UOS_RAM_SIZE and SOS_RAM_SIZE in scenario config since these
two config elements are useless.

Tracked-On: #5927
Signed-off-by: Shuang Zheng <shuang.zheng@intel.com>
Reviewed-by: Victor Sun <victor.sun@intel.com>
This commit is contained in:
Shuang Zheng 2021-04-13 15:39:16 +00:00 committed by wenlingz
parent fee0025db8
commit b953a33bd8
62 changed files with 3 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/faq.rst
View File

@ -26,8 +26,6 @@ physical memory on your platform. Check the documentation for these
option settings for details:
* :option:`hv.MEMORY.PLATFORM_RAM_SIZE`
* :option:`hv.MEMORY.SOS_RAM_SIZE`
* :option:`hv.MEMORY.UOS_RAM_SIZE`
* :option:`hv.MEMORY.HV_RAM_SIZE`
Check the :ref:`acrn_configuration_tool` for more information on how

3
misc/config_tools/data/apl-mrb/hybrid.xml
View File

@ -40,8 +40,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
@ -137,7 +135,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

2
misc/config_tools/data/apl-mrb/industry.xml
View File

@ -40,8 +40,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>

2
misc/config_tools/data/apl-mrb/logical_partition.xml
View File

@ -40,8 +40,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>

3
misc/config_tools/data/apl-mrb/sdc.xml
View File

@ -40,8 +40,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
@ -72,7 +70,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

2
misc/config_tools/data/apl-up2-n3350/logical_partition.xml
View File

@ -40,8 +40,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>

3
misc/config_tools/data/apl-up2/hybrid.xml
View File

@ -40,8 +40,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
@ -137,7 +135,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

2
misc/config_tools/data/apl-up2/industry.xml
View File

@ -40,8 +40,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>

2
misc/config_tools/data/apl-up2/logical_partition.xml
View File

@ -40,8 +40,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>

3
misc/config_tools/data/apl-up2/sdc.xml
View File

@ -40,8 +40,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
@ -72,7 +70,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

3
misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml
View File

@ -36,8 +36,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x800000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x800000000</PLATFORM_RAM_SIZE>
</MEMORY>
@ -137,7 +135,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

2
misc/config_tools/data/cfl-k700-i7/industry.xml
View File

@ -36,8 +36,6 @@
<HV_RAM_SIZE>0x16800000</HV_RAM_SIZE>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x800000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x800000000</PLATFORM_RAM_SIZE>
</MEMORY>

2
misc/config_tools/data/ehl-crb-b/fusa_partition.xml
View File

@ -50,8 +50,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
<CAPACITIES>

3
misc/config_tools/data/ehl-crb-b/hybrid.xml
View File

@ -50,8 +50,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
<CAPACITIES>
@ -147,7 +145,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

3
misc/config_tools/data/ehl-crb-b/hybrid_rt.xml
View File

@ -53,8 +53,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
<CAPACITIES>
@ -148,7 +146,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

3
misc/config_tools/data/ehl-crb-b/hybrid_rt_fusa.xml
View File

@ -50,8 +50,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
<CAPACITIES>
@ -148,7 +146,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

2
misc/config_tools/data/ehl-crb-b/industry.xml
View File

@ -53,8 +53,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
<CAPACITIES>

2
misc/config_tools/data/ehl-crb-b/logical_partition.xml
View File

@ -50,8 +50,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
<CAPACITIES>

3
misc/config_tools/data/ehl-crb-b/sdc.xml
View File

@ -50,8 +50,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
<CAPACITIES>
@ -79,7 +77,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

2
misc/config_tools/data/generic_board/generic_code/hybrid/generic_board.config
View File

@ -5,8 +5,6 @@ CONFIG_HV_RAM_START=0x11000000
CONFIG_HV_RAM_SIZE=0x9600000
CONFIG_PLATFORM_RAM_SIZE=0x400000000
CONFIG_LOW_RAM_SIZE=0x00010000
CONFIG_SOS_RAM_SIZE=0x400000000
CONFIG_UOS_RAM_SIZE=0x200000000
CONFIG_STACK_SIZE=0x2000
CONFIG_IVSHMEM_ENABLED=n
CONFIG_GPU_SBDF=0x00000010

1
misc/config_tools/data/generic_board/generic_code/hybrid/vm_configurations.c
View File

@ -80,7 +80,6 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
.cpu_affinity = SOS_VM_CONFIG_CPU_AFFINITY,
.memory = {
.start_hpa = 0UL,
.size = CONFIG_SOS_RAM_SIZE,
},
.os_config = {
.name = "ACRN Service OS",

2
misc/config_tools/data/generic_board/generic_code/hybrid_rt/generic_board.config
View File

@ -5,8 +5,6 @@ CONFIG_HV_RAM_START=0x11000000
CONFIG_HV_RAM_SIZE=0xc000000
CONFIG_PLATFORM_RAM_SIZE=0x400000000
CONFIG_LOW_RAM_SIZE=0x00010000
CONFIG_SOS_RAM_SIZE=0x400000000
CONFIG_UOS_RAM_SIZE=0x200000000
CONFIG_STACK_SIZE=0x2000
CONFIG_IVSHMEM_ENABLED=y
CONFIG_GPU_SBDF=0x00000010

1
misc/config_tools/data/generic_board/generic_code/hybrid_rt/vm_configurations.c
View File

@ -82,7 +82,6 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
.cpu_affinity = SOS_VM_CONFIG_CPU_AFFINITY,
.memory = {
.start_hpa = 0UL,
.size = CONFIG_SOS_RAM_SIZE,
},
.os_config = {
.name = "ACRN Service OS",

2
misc/config_tools/data/generic_board/generic_code/industry/generic_board.config
View File

@ -5,8 +5,6 @@ CONFIG_HV_RAM_START=0x11000000
CONFIG_HV_RAM_SIZE=0x14800000
CONFIG_PLATFORM_RAM_SIZE=0x400000000
CONFIG_LOW_RAM_SIZE=0x00010000
CONFIG_SOS_RAM_SIZE=0x400000000
CONFIG_UOS_RAM_SIZE=0x200000000
CONFIG_STACK_SIZE=0x2000
CONFIG_IVSHMEM_ENABLED=n
CONFIG_GPU_SBDF=0x00000010

1
misc/config_tools/data/generic_board/generic_code/industry/vm_configurations.c
View File

@ -24,7 +24,6 @@ struct acrn_vm_config vm_configs[CONFIG_MAX_VM_NUM] = {
.cpu_affinity = SOS_VM_CONFIG_CPU_AFFINITY,
.memory = {
.start_hpa = 0UL,
.size = CONFIG_SOS_RAM_SIZE,
},
.os_config = {
.name = "ACRN Service OS",

2
misc/config_tools/data/generic_board/generic_code/logical_partition/generic_board.config
View File

@ -5,8 +5,6 @@ CONFIG_HV_RAM_START=0x11000000
CONFIG_HV_RAM_SIZE=0x7800000
CONFIG_PLATFORM_RAM_SIZE=0x400000000
CONFIG_LOW_RAM_SIZE=0x00010000
CONFIG_SOS_RAM_SIZE=0x400000000
CONFIG_UOS_RAM_SIZE=0x200000000
CONFIG_STACK_SIZE=0x2000
CONFIG_IVSHMEM_ENABLED=n
CONFIG_GPU_SBDF=0x00000010

3
misc/config_tools/data/generic_board/hybrid.xml
View File

@ -51,8 +51,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
<CAPACITIES>
@ -148,7 +146,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

3
misc/config_tools/data/generic_board/hybrid_rt.xml
View File

@ -51,8 +51,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
<CAPACITIES>
@ -146,7 +144,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

2
misc/config_tools/data/generic_board/industry.xml
View File

@ -51,8 +51,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
<CAPACITIES>

2
misc/config_tools/data/generic_board/logical_partition.xml
View File

@ -51,8 +51,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
<CAPACITIES>

3
misc/config_tools/data/nuc6cayh/hybrid.xml
View File

@ -40,8 +40,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
@ -137,7 +135,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

2
misc/config_tools/data/nuc6cayh/industry.xml
View File

@ -40,8 +40,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>

2
misc/config_tools/data/nuc6cayh/logical_partition.xml
View File

@ -40,8 +40,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>

3
misc/config_tools/data/nuc6cayh/sdc.xml
View File

@ -40,8 +40,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
@ -72,7 +70,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

3
misc/config_tools/data/nuc7i7dnb/hybrid.xml
View File

@ -36,8 +36,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
@ -133,7 +131,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

2
misc/config_tools/data/nuc7i7dnb/industry.xml
View File

@ -36,8 +36,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>

2
misc/config_tools/data/nuc7i7dnb/logical_partition.xml
View File

@ -36,8 +36,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>

3
misc/config_tools/data/nuc7i7dnb/sdc.xml
View File

@ -36,8 +36,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
@ -68,7 +66,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

3
misc/config_tools/data/qemu/sdc.xml
View File

@ -36,8 +36,6 @@
<HV_RAM_SIZE>0x07800000</HV_RAM_SIZE>
<HV_RAM_START>0x11000000</HV_RAM_START>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x20000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x100000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x100000000</PLATFORM_RAM_SIZE>
</MEMORY>
@ -68,7 +66,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

3
misc/config_tools/data/tgl-rvp/hybrid.xml
View File

@ -36,8 +36,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x480000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x480000000</PLATFORM_RAM_SIZE>
</MEMORY>
@ -133,7 +131,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

3
misc/config_tools/data/tgl-rvp/hybrid_rt.xml
View File

@ -39,8 +39,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x480000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x480000000</PLATFORM_RAM_SIZE>
</MEMORY>
@ -135,7 +133,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

2
misc/config_tools/data/tgl-rvp/industry.xml
View File

@ -39,8 +39,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x480000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x480000000</PLATFORM_RAM_SIZE>
</MEMORY>

2
misc/config_tools/data/tgl-rvp/logical_partition.xml
View File

@ -36,8 +36,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x480000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x480000000</PLATFORM_RAM_SIZE>
</MEMORY>

3
misc/config_tools/data/tgl-rvp/sdc.xml
View File

@ -36,8 +36,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x480000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x480000000</PLATFORM_RAM_SIZE>
</MEMORY>
@ -68,7 +66,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

3
misc/config_tools/data/whl-ipc-i5/hybrid.xml
View File

@ -36,8 +36,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
@ -133,7 +131,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

3
misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml
View File

@ -36,8 +36,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
@ -136,7 +134,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

2
misc/config_tools/data/whl-ipc-i5/industry.xml
View File

@ -36,8 +36,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>

2
misc/config_tools/data/whl-ipc-i5/logical_partition.xml
View File

@ -36,8 +36,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>

3
misc/config_tools/data/whl-ipc-i5/sdc.xml
View File

@ -36,8 +36,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
@ -68,7 +66,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

3
misc/config_tools/data/whl-ipc-i7/hybrid.xml
View File

@ -36,8 +36,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
@ -133,7 +131,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

3
misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml
View File

@ -36,8 +36,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
@ -136,7 +134,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

2
misc/config_tools/data/whl-ipc-i7/industry.xml
View File

@ -36,8 +36,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>

2
misc/config_tools/data/whl-ipc-i7/logical_partition.xml
View File

@ -36,8 +36,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>

3
misc/config_tools/data/whl-ipc-i7/sdc.xml
View File

@ -40,8 +40,6 @@
<HV_RAM_SIZE/>
<HV_RAM_START/>
<LOW_RAM_SIZE>0x00010000</LOW_RAM_SIZE>
<UOS_RAM_SIZE>0x200000000</UOS_RAM_SIZE>
<SOS_RAM_SIZE>0x400000000</SOS_RAM_SIZE>
<PLATFORM_RAM_SIZE>0x400000000</PLATFORM_RAM_SIZE>
</MEMORY>
@ -72,7 +70,6 @@
</clos>
<memory>
<start_hpa>0</start_hpa>
<size>CONFIG_SOS_RAM_SIZE</size>
</memory>
<os_config>
<name>ACRN Service OS</name>

2
misc/config_tools/hv_config/board_defconfig.py
View File

@ -114,8 +114,6 @@ def get_memory(hv_info, 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_SOS_RAM_SIZE={}".format(hv_info.mem.sos_ram_size), file=config)
print("CONFIG_UOS_RAM_SIZE={}".format(hv_info.mem.uos_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)

4
misc/config_tools/hv_config/hv_item.py
View File

@ -163,8 +163,6 @@ class Memory:
self.hv_ram_size = common.get_hv_item_tag(self.hv_file, "MEMORY", "HV_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.sos_ram_size = common.get_hv_item_tag(self.hv_file, "MEMORY", "SOS_RAM_SIZE")
self.uos_ram_size = common.get_hv_item_tag(self.hv_file, "MEMORY", "UOS_RAM_SIZE")
self.ivshmem_enable = common.get_hv_item_tag(self.hv_file, "FEATURES", "IVSHMEM", "IVSHMEM_ENABLED")
self.ivshmem_region = common.get_hv_item_tag(self.hv_file, "FEATURES", "IVSHMEM", "IVSHMEM_REGION")
@ -172,8 +170,6 @@ class Memory:
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_size_check(self.platform_ram_size, "MEMORY", "PLATFORM_RAM_SIZE")
hv_cfg_lib.hv_size_check(self.sos_ram_size, "MEMORY", "SOS_RAM_SIZE")
hv_cfg_lib.hv_size_check(self.uos_ram_size, "MEMORY", "UOS_RAM_SIZE")
hv_cfg_lib.ny_support_check(self.ivshmem_enable, "FEATURES", "IVSHMEM", "IVSHMEM_ENABLED")

2
misc/config_tools/library/scenario_cfg_lib.py
View File

@ -32,7 +32,7 @@ VUART_IRQ = ['SOS_COM1_IRQ', 'SOS_COM2_IRQ', 'COM1_IRQ', 'COM2_IRQ', 'COM3_IRQ',
# Support 512M, 1G, 2G
# pre launch less then 2G, sos vm less than 24G
START_HPA_SIZE_LIST = ['0x20000000', '0x40000000', '0x80000000', 'CONFIG_SOS_RAM_SIZE']
START_HPA_SIZE_LIST = ['0x20000000', '0x40000000', '0x80000000']
COMMUNICATE_VM_ID = []

1
misc/config_tools/scenario_config/vm_configurations_c.py
View File

@ -260,7 +260,6 @@ def gen_sos_vm(vm_type, vm_i, scenario_items, config):
cpu_affinity_output(vm_info, vm_i, config)
print("\t\t.memory = {", file=config)
print("\t\t\t.start_hpa = {}UL,".format(vm_info.mem_info.mem_start_hpa[vm_i]), file=config)
print("\t\t\t.size = {0},".format("CONFIG_SOS_RAM_SIZE"), file=config)
print("\t\t},", file=config)
print("\t\t.os_config = {", file=config)
print('\t\t\t.name = "{0}",'.format(vm_info.os_cfg.kern_name[vm_i]), file=config)

2
misc/config_tools/schema/VMtypes.xsd
View File

@ -111,7 +111,7 @@ aligned.</xs:documentation>
VM.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="size" type="MemorySizeType" default="0x20000000">
<xs:element name="size" type="MemorySizeType" default="0x20000000" minOccurs="0">
<xs:annotation>
<xs:documentation>The memory size in bytes for the VM. Default
value is ``0x200000000``.</xs:documentation>

12
misc/config_tools/schema/config.xsd
View File

@ -186,18 +186,6 @@ the RAM region used by the hypervisor.</xs:documentation>
``0x10000``, starting from address ``0x0``.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="UOS_RAM_SIZE" type="HexFormat" default="0x200000000">
<xs:annotation>
<xs:documentation>Size of the User VM OS RAM region. Default
value ``0x200000000``.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="SOS_RAM_SIZE" type="HexFormat" default="0x400000000">
<xs:annotation>
<xs:documentation>Size of the Service VM OS RAM region. Default
value ``0x400000000``.</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="PLATFORM_RAM_SIZE" type="HexFormat" default="0x400000000">
<xs:annotation>
<xs:documentation>Size of the physical platform RAM. Default

8
misc/config_tools/schema/types.xsd
View File

@ -57,17 +57,11 @@
<xs:union memberTypes="None MaxMsixTableNumType" />
</xs:simpleType>
<xs:simpleType name="SOSRamSize">
<xs:restriction base="xs:string">
<xs:enumeration value="CONFIG_SOS_RAM_SIZE" />
</xs:restriction>
</xs:simpleType>
<xs:simpleType name="MemorySizeType">
<xs:annotation>
<xs:documentation>An Integer value in hexadecimal format.</xs:documentation>
</xs:annotation>
<xs:union memberTypes="SOSRamSize HexFormat" />
<xs:union memberTypes="HexFormat" />
</xs:simpleType>
<xs:simpleType name="LogLevelType">

8
misc/config_tools/xforms/config_common.xsl
View File

@ -139,14 +139,6 @@
<xsl:with-param name="key" select="'LOW_RAM_SIZE'" />
</xsl:call-template>
<xsl:call-template name="integer-by-key">
<xsl:with-param name="key" select="'SOS_RAM_SIZE'" />
</xsl:call-template>
<xsl:call-template name="integer-by-key">
<xsl:with-param name="key" select="'UOS_RAM_SIZE'" />
</xsl:call-template>
<xsl:call-template name="integer-by-key">
<xsl:with-param name="key" select="'STACK_SIZE'" />
</xsl:call-template>