doc: Update logical_partition documentation

1.Modified Intel Whiskey Lake to Intel NUC Kit NUC11TNBi5
2.Change the logical partition and mixed test motherboard name

Signed-off-by: zhongzhenx.liu <zhongzhenx.liu@intel.com>
This commit is contained in:
jackwhich 2021-09-27 11:17:59 +08:00 committed by David Kinder
parent 28824c1e74
commit 0f05204cbc
2 changed files with 12 additions and 12 deletions

View File

@ -32,7 +32,7 @@ as shown in :numref:`hybrid_scenario_on_nuc`.
Set-up base installation
************************
- Use the `Intel NUC Kit NUC7i7DNHE <https://www.intel.com/content/www/us/en/products/boards-kits/nuc/kits/nuc7i7dnhe.html>`_.
- Use the `Intel NUC Kit NUC11TNBi5 <https://ark.intel.com/content/www/us/en/ark/products/205596/intel-nuc-11-pro-board-nuc11tnbi5.html>`_.
- Connect to the serial port as described in :ref:`Connecting to the serial port <connect_serial_port>`.
- Install Ubuntu 18.04 on your SATA device or on the NVME disk of your
Intel NUC.
@ -58,9 +58,9 @@ Set-up ACRN on your device
**************************
- Follow the instructions in :Ref:`gsg` to build ACRN using the
``hybrid`` scenario. Here is the build command-line for the `Intel NUC Kit NUC7i7DNHE <https://www.intel.com/content/www/us/en/products/boards-kits/nuc/kits/nuc7i7dnhe.html>`_::
``hybrid`` scenario. Here is the build command-line for the `Intel NUC Kit NUC11TNBi5 <https://ark.intel.com/content/www/us/en/ark/products/205596/intel-nuc-11-pro-board-nuc11tnbi5.html>`_::
make BOARD=nuc7i7dnb SCENARIO=hybrid
make clean && make BOARD=nuc11tnbi5 SCENARIO=hybrid
- Install the ACRN hypervisor and tools
@ -112,12 +112,12 @@ Perform the following to update Ubuntu GRUB so it can boot the hypervisor and lo
.. note:: The module ``/boot/zephyr.elf`` is the VM0 (Zephyr) kernel file.
The param ``xxxxxx`` is VM0's kernel file tag and must exactly match the
``kern_mod`` of VM0, which is configured in the ``misc/config_tools/data/nuc7i7dnb/hybrid.xml``
``kern_mod`` of VM0, which is configured in the ``misc/config_tools/data/nuc11tnbi5/hybrid.xml``
file. The multiboot module ``/boot/bzImage`` is the Service VM kernel
file. The param ``yyyyyy`` is the bzImage tag and must exactly match the
``kern_mod`` of VM1 in the ``misc/config_tools/data/nuc7i7dnb/hybrid.xml``
``kern_mod`` of VM1 in the ``misc/config_tools/data/nuc11tnbi5/hybrid.xml``
file. The kernel command-line arguments used to boot the Service VM are
``bootargs`` of VM1 in the ``misc/config_tools/data/nuc7i7dnb/hybrid.xml``.
``bootargs`` of VM1 in the ``misc/config_tools/data/nuc11tnbi5/hybrid.xml``.
The module ``/boot/ACPI_VM0.bin`` is the binary of ACPI tables for pre-launched VM0 (Zephyr).
The parameter ``ACPI_VM0`` is VM0's ACPI tag and should not be modified.

View File

@ -23,7 +23,7 @@ Validated Versions
Prerequisites
*************
* `Intel Whiskey Lake <http://www.maxtangpc.com/industrialmotherboards/142.html#parameters>`_
* `Intel NUC Kit NUC11TNBi5 <https://ark.intel.com/content/www/us/en/ark/products/205596/intel-nuc-11-pro-board-nuc11tnbi5.html>`_.
* NVMe disk
* SATA disk
* Storage device with USB interface (such as USB Flash
@ -45,7 +45,7 @@ Update Kernel Image and Modules of Pre-Launched VM
#. On the local Ubuntu target machine, find the kernel file,
copy to your (``/boot`` directory) and name the file ``bzImage``.
The ``uname -r`` command returns the kernel release, for example,
``5.11.0-34-generic``):
``4.15.0-55-generic``):
.. code-block:: none
@ -132,7 +132,7 @@ Update ACRN Hypervisor Image
$ cd acrn-hypervisor
$ git checkout v2.6
#. Check the ``pci_devs`` sections in ``misc/config_tools/data/nuc7i7dnb/logical_partition.xml``
#. Check the ``pci_devs`` sections in ``misc/config_tools/data/nuc11tnbi5/logical_partition.xml``
for each pre-launched VM to ensure you are using the right PCI device BDF information (as
reported by ``lspci -vv``). If you need to make changes to this file, create a copy of it and
use it subsequently when building ACRN (``SCENARIO=/path/to/newfile.xml``).
@ -141,7 +141,7 @@ Update ACRN Hypervisor Image
.. code-block:: none
$ make hypervisor BOARD=nuc7i7dnb SCENARIO=logical_partition RELEASE=0
$ make hypervisor BOARD=nuc11tnbi5 SCENARIO=logical_partition RELEASE=0
.. note::
The ``acrn.bin`` will be generated to ``./build/hypervisor/acrn.bin``.
@ -197,9 +197,9 @@ Update Ubuntu GRUB to Boot Hypervisor and Load Kernel Image
Update the UUID (``--set``) and PARTUUID (``root=`` parameter)
(or use the device node directly) of the root partition (e.g.``/dev/nvme0n1p2). Hint: use ``sudo blkid``.
The kernel command-line arguments used to boot the pre-launched VMs is ``bootargs``
in the ``misc/config_tools/data/nuc7i7dnb/logical_partition.xml``
in the ``misc/config_tools/data/nuc11tnbi5/logical_partition.xml``
The ``module2 /boot/bzImage`` param ``XXXXXX`` is the bzImage tag and must exactly match the ``kern_mod``
in the ``misc/config_tools/data/nuc7i7dnb/logical_partition.xml`` file.
in the ``misc/config_tools/data/nuc11tnbi5/logical_partition.xml`` file.
The module ``/boot/ACPI_VM0.bin`` is the binary of ACPI tables for pre-launched VM0, the parameter ``ACPI_VM0`` is
VM0's ACPI tag and should not be modified.
The module ``/boot/ACPI_VM1.bin`` is the binary of ACPI tables for pre-launched VM1 the parameter ``ACPI_VM1`` is