diff --git a/doc/faq.rst b/doc/faq.rst index f94e0d730..7c806b2b6 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -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 diff --git a/misc/config_tools/data/apl-mrb/hybrid.xml b/misc/config_tools/data/apl-mrb/hybrid.xml index bb5c79c7c..1f58de9c2 100644 --- a/misc/config_tools/data/apl-mrb/hybrid.xml +++ b/misc/config_tools/data/apl-mrb/hybrid.xml @@ -40,8 +40,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 @@ -137,7 +135,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS diff --git a/misc/config_tools/data/apl-mrb/industry.xml b/misc/config_tools/data/apl-mrb/industry.xml index 196abf312..cdc8a04da 100644 --- a/misc/config_tools/data/apl-mrb/industry.xml +++ b/misc/config_tools/data/apl-mrb/industry.xml @@ -40,8 +40,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 diff --git a/misc/config_tools/data/apl-mrb/logical_partition.xml b/misc/config_tools/data/apl-mrb/logical_partition.xml index 66eac3559..e431d7cf2 100644 --- a/misc/config_tools/data/apl-mrb/logical_partition.xml +++ b/misc/config_tools/data/apl-mrb/logical_partition.xml @@ -40,8 +40,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 diff --git a/misc/config_tools/data/apl-mrb/sdc.xml b/misc/config_tools/data/apl-mrb/sdc.xml index 42cc6177d..b065f57f9 100644 --- a/misc/config_tools/data/apl-mrb/sdc.xml +++ b/misc/config_tools/data/apl-mrb/sdc.xml @@ -40,8 +40,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 @@ -72,7 +70,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS diff --git a/misc/config_tools/data/apl-up2-n3350/logical_partition.xml b/misc/config_tools/data/apl-up2-n3350/logical_partition.xml index 85aa2dca0..1e358fde6 100644 --- a/misc/config_tools/data/apl-up2-n3350/logical_partition.xml +++ b/misc/config_tools/data/apl-up2-n3350/logical_partition.xml @@ -40,8 +40,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 diff --git a/misc/config_tools/data/apl-up2/hybrid.xml b/misc/config_tools/data/apl-up2/hybrid.xml index 804882a51..18cd735d9 100644 --- a/misc/config_tools/data/apl-up2/hybrid.xml +++ b/misc/config_tools/data/apl-up2/hybrid.xml @@ -40,8 +40,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 @@ -137,7 +135,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS diff --git a/misc/config_tools/data/apl-up2/industry.xml b/misc/config_tools/data/apl-up2/industry.xml index e09b37ece..44cf643e1 100644 --- a/misc/config_tools/data/apl-up2/industry.xml +++ b/misc/config_tools/data/apl-up2/industry.xml @@ -40,8 +40,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 diff --git a/misc/config_tools/data/apl-up2/logical_partition.xml b/misc/config_tools/data/apl-up2/logical_partition.xml index f4f97fe27..9614df0af 100644 --- a/misc/config_tools/data/apl-up2/logical_partition.xml +++ b/misc/config_tools/data/apl-up2/logical_partition.xml @@ -40,8 +40,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 diff --git a/misc/config_tools/data/apl-up2/sdc.xml b/misc/config_tools/data/apl-up2/sdc.xml index eb88eac31..405bed01e 100644 --- a/misc/config_tools/data/apl-up2/sdc.xml +++ b/misc/config_tools/data/apl-up2/sdc.xml @@ -40,8 +40,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 @@ -72,7 +70,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS 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 7ce9dc7b9..be4d24d84 100644 --- a/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml +++ b/misc/config_tools/data/cfl-k700-i7/hybrid_rt.xml @@ -36,8 +36,6 @@ 0x00010000 - 0x200000000 - 0x800000000 0x800000000 @@ -137,7 +135,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS diff --git a/misc/config_tools/data/cfl-k700-i7/industry.xml b/misc/config_tools/data/cfl-k700-i7/industry.xml index 7135b12d0..537c38fd4 100644 --- a/misc/config_tools/data/cfl-k700-i7/industry.xml +++ b/misc/config_tools/data/cfl-k700-i7/industry.xml @@ -36,8 +36,6 @@ 0x16800000 0x00010000 - 0x200000000 - 0x800000000 0x800000000 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 971edb2e8..19e185aab 100644 --- a/misc/config_tools/data/ehl-crb-b/fusa_partition.xml +++ b/misc/config_tools/data/ehl-crb-b/fusa_partition.xml @@ -50,8 +50,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 diff --git a/misc/config_tools/data/ehl-crb-b/hybrid.xml b/misc/config_tools/data/ehl-crb-b/hybrid.xml index 17a1ee370..6d7e501b6 100644 --- a/misc/config_tools/data/ehl-crb-b/hybrid.xml +++ b/misc/config_tools/data/ehl-crb-b/hybrid.xml @@ -50,8 +50,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 @@ -147,7 +145,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS 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 fc5112cd7..ae56f1923 100644 --- a/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml +++ b/misc/config_tools/data/ehl-crb-b/hybrid_rt.xml @@ -53,8 +53,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 @@ -148,7 +146,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS 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 bb96b6feb..f211026d9 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 @@ -50,8 +50,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 @@ -148,7 +146,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS diff --git a/misc/config_tools/data/ehl-crb-b/industry.xml b/misc/config_tools/data/ehl-crb-b/industry.xml index dbd83e9f7..5f326a2a3 100644 --- a/misc/config_tools/data/ehl-crb-b/industry.xml +++ b/misc/config_tools/data/ehl-crb-b/industry.xml @@ -53,8 +53,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 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 1214d6d69..912bacab5 100644 --- a/misc/config_tools/data/ehl-crb-b/logical_partition.xml +++ b/misc/config_tools/data/ehl-crb-b/logical_partition.xml @@ -50,8 +50,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 diff --git a/misc/config_tools/data/ehl-crb-b/sdc.xml b/misc/config_tools/data/ehl-crb-b/sdc.xml index 6da94f740..f3cf1c33c 100644 --- a/misc/config_tools/data/ehl-crb-b/sdc.xml +++ b/misc/config_tools/data/ehl-crb-b/sdc.xml @@ -50,8 +50,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 @@ -79,7 +77,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS 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 ed99cee9d..6b28700ee 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 @@ -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 diff --git a/misc/config_tools/data/generic_board/generic_code/hybrid/vm_configurations.c b/misc/config_tools/data/generic_board/generic_code/hybrid/vm_configurations.c index 647e7dff0..bf9052980 100644 --- a/misc/config_tools/data/generic_board/generic_code/hybrid/vm_configurations.c +++ b/misc/config_tools/data/generic_board/generic_code/hybrid/vm_configurations.c @@ -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", diff --git a/misc/config_tools/data/generic_board/generic_code/hybrid_rt/generic_board.config b/misc/config_tools/data/generic_board/generic_code/hybrid_rt/generic_board.config index 4c1b57aa2..e887af67f 100644 --- a/misc/config_tools/data/generic_board/generic_code/hybrid_rt/generic_board.config +++ b/misc/config_tools/data/generic_board/generic_code/hybrid_rt/generic_board.config @@ -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 diff --git a/misc/config_tools/data/generic_board/generic_code/hybrid_rt/vm_configurations.c b/misc/config_tools/data/generic_board/generic_code/hybrid_rt/vm_configurations.c index 8ea49a44b..7a463409c 100644 --- a/misc/config_tools/data/generic_board/generic_code/hybrid_rt/vm_configurations.c +++ b/misc/config_tools/data/generic_board/generic_code/hybrid_rt/vm_configurations.c @@ -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", diff --git a/misc/config_tools/data/generic_board/generic_code/industry/generic_board.config b/misc/config_tools/data/generic_board/generic_code/industry/generic_board.config index 4c83090a3..216acbb0f 100644 --- a/misc/config_tools/data/generic_board/generic_code/industry/generic_board.config +++ b/misc/config_tools/data/generic_board/generic_code/industry/generic_board.config @@ -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 diff --git a/misc/config_tools/data/generic_board/generic_code/industry/vm_configurations.c b/misc/config_tools/data/generic_board/generic_code/industry/vm_configurations.c index 0ddfadc78..5f8c950a8 100644 --- a/misc/config_tools/data/generic_board/generic_code/industry/vm_configurations.c +++ b/misc/config_tools/data/generic_board/generic_code/industry/vm_configurations.c @@ -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", diff --git a/misc/config_tools/data/generic_board/generic_code/logical_partition/generic_board.config b/misc/config_tools/data/generic_board/generic_code/logical_partition/generic_board.config index cfc37d499..7cdca80e3 100644 --- a/misc/config_tools/data/generic_board/generic_code/logical_partition/generic_board.config +++ b/misc/config_tools/data/generic_board/generic_code/logical_partition/generic_board.config @@ -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 diff --git a/misc/config_tools/data/generic_board/hybrid.xml b/misc/config_tools/data/generic_board/hybrid.xml index 100bd2d8b..932dae85f 100644 --- a/misc/config_tools/data/generic_board/hybrid.xml +++ b/misc/config_tools/data/generic_board/hybrid.xml @@ -51,8 +51,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 @@ -148,7 +146,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS diff --git a/misc/config_tools/data/generic_board/hybrid_rt.xml b/misc/config_tools/data/generic_board/hybrid_rt.xml index 8e8bcde0b..e8b89a940 100644 --- a/misc/config_tools/data/generic_board/hybrid_rt.xml +++ b/misc/config_tools/data/generic_board/hybrid_rt.xml @@ -51,8 +51,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 @@ -146,7 +144,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS diff --git a/misc/config_tools/data/generic_board/industry.xml b/misc/config_tools/data/generic_board/industry.xml index 35d2fb207..8130836ef 100644 --- a/misc/config_tools/data/generic_board/industry.xml +++ b/misc/config_tools/data/generic_board/industry.xml @@ -51,8 +51,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 diff --git a/misc/config_tools/data/generic_board/logical_partition.xml b/misc/config_tools/data/generic_board/logical_partition.xml index 250aceefc..f3008f651 100644 --- a/misc/config_tools/data/generic_board/logical_partition.xml +++ b/misc/config_tools/data/generic_board/logical_partition.xml @@ -51,8 +51,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 diff --git a/misc/config_tools/data/nuc6cayh/hybrid.xml b/misc/config_tools/data/nuc6cayh/hybrid.xml index 727b3277f..a400a3a5b 100644 --- a/misc/config_tools/data/nuc6cayh/hybrid.xml +++ b/misc/config_tools/data/nuc6cayh/hybrid.xml @@ -40,8 +40,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 @@ -137,7 +135,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS diff --git a/misc/config_tools/data/nuc6cayh/industry.xml b/misc/config_tools/data/nuc6cayh/industry.xml index 6a56f6fda..1acf6ee0d 100644 --- a/misc/config_tools/data/nuc6cayh/industry.xml +++ b/misc/config_tools/data/nuc6cayh/industry.xml @@ -40,8 +40,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 diff --git a/misc/config_tools/data/nuc6cayh/logical_partition.xml b/misc/config_tools/data/nuc6cayh/logical_partition.xml index a984049d9..114d8199c 100644 --- a/misc/config_tools/data/nuc6cayh/logical_partition.xml +++ b/misc/config_tools/data/nuc6cayh/logical_partition.xml @@ -40,8 +40,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 diff --git a/misc/config_tools/data/nuc6cayh/sdc.xml b/misc/config_tools/data/nuc6cayh/sdc.xml index 1c1441a49..e6e4ec3d7 100644 --- a/misc/config_tools/data/nuc6cayh/sdc.xml +++ b/misc/config_tools/data/nuc6cayh/sdc.xml @@ -40,8 +40,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 @@ -72,7 +70,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS diff --git a/misc/config_tools/data/nuc7i7dnb/hybrid.xml b/misc/config_tools/data/nuc7i7dnb/hybrid.xml index 8dd09dfe4..4ac540f28 100644 --- a/misc/config_tools/data/nuc7i7dnb/hybrid.xml +++ b/misc/config_tools/data/nuc7i7dnb/hybrid.xml @@ -36,8 +36,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 @@ -133,7 +131,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS diff --git a/misc/config_tools/data/nuc7i7dnb/industry.xml b/misc/config_tools/data/nuc7i7dnb/industry.xml index e82857b10..e59ffd51f 100644 --- a/misc/config_tools/data/nuc7i7dnb/industry.xml +++ b/misc/config_tools/data/nuc7i7dnb/industry.xml @@ -36,8 +36,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 diff --git a/misc/config_tools/data/nuc7i7dnb/logical_partition.xml b/misc/config_tools/data/nuc7i7dnb/logical_partition.xml index f8c5b0fbd..83ff4fd23 100644 --- a/misc/config_tools/data/nuc7i7dnb/logical_partition.xml +++ b/misc/config_tools/data/nuc7i7dnb/logical_partition.xml @@ -36,8 +36,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 diff --git a/misc/config_tools/data/nuc7i7dnb/sdc.xml b/misc/config_tools/data/nuc7i7dnb/sdc.xml index 986fd942e..66ed28020 100644 --- a/misc/config_tools/data/nuc7i7dnb/sdc.xml +++ b/misc/config_tools/data/nuc7i7dnb/sdc.xml @@ -36,8 +36,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 @@ -68,7 +66,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS diff --git a/misc/config_tools/data/qemu/sdc.xml b/misc/config_tools/data/qemu/sdc.xml index a5584e61f..541353565 100644 --- a/misc/config_tools/data/qemu/sdc.xml +++ b/misc/config_tools/data/qemu/sdc.xml @@ -36,8 +36,6 @@ 0x07800000 0x11000000 0x00010000 - 0x20000000 - 0x100000000 0x100000000 @@ -68,7 +66,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS diff --git a/misc/config_tools/data/tgl-rvp/hybrid.xml b/misc/config_tools/data/tgl-rvp/hybrid.xml index 500504515..eb2ea114f 100644 --- a/misc/config_tools/data/tgl-rvp/hybrid.xml +++ b/misc/config_tools/data/tgl-rvp/hybrid.xml @@ -36,8 +36,6 @@ 0x00010000 - 0x200000000 - 0x480000000 0x480000000 @@ -133,7 +131,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS diff --git a/misc/config_tools/data/tgl-rvp/hybrid_rt.xml b/misc/config_tools/data/tgl-rvp/hybrid_rt.xml index 628cf35c0..714725d90 100644 --- a/misc/config_tools/data/tgl-rvp/hybrid_rt.xml +++ b/misc/config_tools/data/tgl-rvp/hybrid_rt.xml @@ -39,8 +39,6 @@ 0x00010000 - 0x200000000 - 0x480000000 0x480000000 @@ -135,7 +133,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS diff --git a/misc/config_tools/data/tgl-rvp/industry.xml b/misc/config_tools/data/tgl-rvp/industry.xml index 926be0a7e..49ee0cbed 100644 --- a/misc/config_tools/data/tgl-rvp/industry.xml +++ b/misc/config_tools/data/tgl-rvp/industry.xml @@ -39,8 +39,6 @@ 0x00010000 - 0x200000000 - 0x480000000 0x480000000 diff --git a/misc/config_tools/data/tgl-rvp/logical_partition.xml b/misc/config_tools/data/tgl-rvp/logical_partition.xml index c5e1b91c2..4f628cece 100644 --- a/misc/config_tools/data/tgl-rvp/logical_partition.xml +++ b/misc/config_tools/data/tgl-rvp/logical_partition.xml @@ -36,8 +36,6 @@ 0x00010000 - 0x200000000 - 0x480000000 0x480000000 diff --git a/misc/config_tools/data/tgl-rvp/sdc.xml b/misc/config_tools/data/tgl-rvp/sdc.xml index a75308021..76d608d2f 100644 --- a/misc/config_tools/data/tgl-rvp/sdc.xml +++ b/misc/config_tools/data/tgl-rvp/sdc.xml @@ -36,8 +36,6 @@ 0x00010000 - 0x200000000 - 0x480000000 0x480000000 @@ -68,7 +66,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS diff --git a/misc/config_tools/data/whl-ipc-i5/hybrid.xml b/misc/config_tools/data/whl-ipc-i5/hybrid.xml index 8baa591b4..52468f344 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid.xml @@ -36,8 +36,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 @@ -133,7 +131,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS 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 944bd9964..7467e871a 100644 --- a/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml +++ b/misc/config_tools/data/whl-ipc-i5/hybrid_rt.xml @@ -36,8 +36,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 @@ -136,7 +134,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS diff --git a/misc/config_tools/data/whl-ipc-i5/industry.xml b/misc/config_tools/data/whl-ipc-i5/industry.xml index 7e4f54cb6..e7dd9c653 100644 --- a/misc/config_tools/data/whl-ipc-i5/industry.xml +++ b/misc/config_tools/data/whl-ipc-i5/industry.xml @@ -36,8 +36,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 diff --git a/misc/config_tools/data/whl-ipc-i5/logical_partition.xml b/misc/config_tools/data/whl-ipc-i5/logical_partition.xml index 3220e1672..8f54b0c3d 100644 --- a/misc/config_tools/data/whl-ipc-i5/logical_partition.xml +++ b/misc/config_tools/data/whl-ipc-i5/logical_partition.xml @@ -36,8 +36,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 diff --git a/misc/config_tools/data/whl-ipc-i5/sdc.xml b/misc/config_tools/data/whl-ipc-i5/sdc.xml index 432ff42d1..184243b28 100644 --- a/misc/config_tools/data/whl-ipc-i5/sdc.xml +++ b/misc/config_tools/data/whl-ipc-i5/sdc.xml @@ -36,8 +36,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 @@ -68,7 +66,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS diff --git a/misc/config_tools/data/whl-ipc-i7/hybrid.xml b/misc/config_tools/data/whl-ipc-i7/hybrid.xml index 8484d8371..801d2c790 100644 --- a/misc/config_tools/data/whl-ipc-i7/hybrid.xml +++ b/misc/config_tools/data/whl-ipc-i7/hybrid.xml @@ -36,8 +36,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 @@ -133,7 +131,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS diff --git a/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml b/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml index 2ffccd75b..b2829ade5 100644 --- a/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml +++ b/misc/config_tools/data/whl-ipc-i7/hybrid_rt.xml @@ -36,8 +36,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 @@ -136,7 +134,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS diff --git a/misc/config_tools/data/whl-ipc-i7/industry.xml b/misc/config_tools/data/whl-ipc-i7/industry.xml index c2d4d6e32..736de3040 100644 --- a/misc/config_tools/data/whl-ipc-i7/industry.xml +++ b/misc/config_tools/data/whl-ipc-i7/industry.xml @@ -36,8 +36,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 diff --git a/misc/config_tools/data/whl-ipc-i7/logical_partition.xml b/misc/config_tools/data/whl-ipc-i7/logical_partition.xml index 434d87c9b..2f62a218e 100644 --- a/misc/config_tools/data/whl-ipc-i7/logical_partition.xml +++ b/misc/config_tools/data/whl-ipc-i7/logical_partition.xml @@ -36,8 +36,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 diff --git a/misc/config_tools/data/whl-ipc-i7/sdc.xml b/misc/config_tools/data/whl-ipc-i7/sdc.xml index 284d7dd4e..a58fb43ba 100644 --- a/misc/config_tools/data/whl-ipc-i7/sdc.xml +++ b/misc/config_tools/data/whl-ipc-i7/sdc.xml @@ -40,8 +40,6 @@ 0x00010000 - 0x200000000 - 0x400000000 0x400000000 @@ -72,7 +70,6 @@ 0 - CONFIG_SOS_RAM_SIZE ACRN Service OS diff --git a/misc/config_tools/hv_config/board_defconfig.py b/misc/config_tools/hv_config/board_defconfig.py index b9dcd2b4b..acef2d3d7 100644 --- a/misc/config_tools/hv_config/board_defconfig.py +++ b/misc/config_tools/hv_config/board_defconfig.py @@ -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) diff --git a/misc/config_tools/hv_config/hv_item.py b/misc/config_tools/hv_config/hv_item.py index 11e6c9866..a92245224 100644 --- a/misc/config_tools/hv_config/hv_item.py +++ b/misc/config_tools/hv_config/hv_item.py @@ -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") diff --git a/misc/config_tools/library/scenario_cfg_lib.py b/misc/config_tools/library/scenario_cfg_lib.py index 612c97b9a..02b1635d0 100644 --- a/misc/config_tools/library/scenario_cfg_lib.py +++ b/misc/config_tools/library/scenario_cfg_lib.py @@ -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 = [] diff --git a/misc/config_tools/scenario_config/vm_configurations_c.py b/misc/config_tools/scenario_config/vm_configurations_c.py index 4fa512d24..2882685af 100644 --- a/misc/config_tools/scenario_config/vm_configurations_c.py +++ b/misc/config_tools/scenario_config/vm_configurations_c.py @@ -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) diff --git a/misc/config_tools/schema/VMtypes.xsd b/misc/config_tools/schema/VMtypes.xsd index 94f905d3b..329d5ba26 100644 --- a/misc/config_tools/schema/VMtypes.xsd +++ b/misc/config_tools/schema/VMtypes.xsd @@ -111,7 +111,7 @@ aligned. VM. - + The memory size in bytes for the VM. Default value is ``0x200000000``. diff --git a/misc/config_tools/schema/config.xsd b/misc/config_tools/schema/config.xsd index 251500c1f..0779b7372 100644 --- a/misc/config_tools/schema/config.xsd +++ b/misc/config_tools/schema/config.xsd @@ -186,18 +186,6 @@ the RAM region used by the hypervisor. ``0x10000``, starting from address ``0x0``. - - - Size of the User VM OS RAM region. Default -value ``0x200000000``. - - - - - Size of the Service VM OS RAM region. Default -value ``0x400000000``. - - Size of the physical platform RAM. Default diff --git a/misc/config_tools/schema/types.xsd b/misc/config_tools/schema/types.xsd index 96885fd68..0a928cdc0 100644 --- a/misc/config_tools/schema/types.xsd +++ b/misc/config_tools/schema/types.xsd @@ -57,17 +57,11 @@ - - - - - - An Integer value in hexadecimal format. - + diff --git a/misc/config_tools/xforms/config_common.xsl b/misc/config_tools/xforms/config_common.xsl index a7a4cb004..487437a7e 100644 --- a/misc/config_tools/xforms/config_common.xsl +++ b/misc/config_tools/xforms/config_common.xsl @@ -139,14 +139,6 @@ - - - - - - - -