From ef13f2462a2bc5b5ea579d044063aa225fa090c9 Mon Sep 17 00:00:00 2001 From: "Xie, nanlin" Date: Sat, 15 Dec 2018 00:07:15 +0800 Subject: [PATCH] Doc: Update GSG for v0.4 version and launch and acrn.conf sample script Signed-off-by: Xie, nanlin --- devicemodel/samples/nuc/launch_uos.sh | 2 +- doc/getting-started/apl-nuc.rst | 38 ++++++++++++------------ hypervisor/bsp/uefi/clearlinux/acrn.conf | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/devicemodel/samples/nuc/launch_uos.sh b/devicemodel/samples/nuc/launch_uos.sh index dd9f269f6..4a11b3259 100755 --- a/devicemodel/samples/nuc/launch_uos.sh +++ b/devicemodel/samples/nuc/launch_uos.sh @@ -20,7 +20,7 @@ acrn-dm -A -m $mem_size -c $2 -s 0:0,hostbridge -s 1:0,lpc -l com1,stdio \ -s 2,pci-gvt -G "$3" \ -s 5,virtio-console,@pty:pty_port \ -s 6,virtio-hyper_dmabuf \ - -s 3,virtio-blk,/home/clear/uos/clear-26200-kvm.img \ + -s 3,virtio-blk,/home/clear/uos/clear-26770-kvm.img \ -s 4,virtio-net,tap0 \ -k /usr/lib/kernel/default-iot-lts2018 \ -B "root=/dev/vda3 rw rootwait maxcpus=$2 nohpet console=tty0 console=hvc0 \ diff --git a/doc/getting-started/apl-nuc.rst b/doc/getting-started/apl-nuc.rst index 217f61673..2b7fbfc1d 100644 --- a/doc/getting-started/apl-nuc.rst +++ b/doc/getting-started/apl-nuc.rst @@ -37,13 +37,13 @@ complete this setup. .. note:: - ACRN v0.3 (and the current master branch) requires Clear Linux - version 26200 or newer. If you use a newer version of Clear Linux, + ACRN v0.4 (and the current master branch) requires Clear Linux + version 26770 or newer. If you use a newer version of Clear Linux, you'll need to adjust the instructions below to reference the version number of Clear Linux you are using. #. Download the compressed Clear installer image from - https://download.clearlinux.org/releases/26200/clear/clear-26200-installer.img.xz + https://download.clearlinux.org/releases/26770/clear/clear-26770-installer.img.xz and follow the `Clear Linux installation guide `__ as a starting point for installing Clear Linux onto your platform. Follow the recommended @@ -74,16 +74,16 @@ complete this setup. .. note:: The Clear Linux installer will automatically check for updates and install the latest version available on your system. If you wish to use a specific version - (such as 26200), you can achieve that after the installation has completed using - ``sudo swupd verify --fix --picky -m 26200`` + (such as 26770), you can achieve that after the installation has completed using + ``sudo swupd verify --fix --picky -m 26770`` #. If you have an older version of Clear Linux already installed on your hardware, use this command to upgrade Clear Linux - to version 26200 (or newer): + to version 26770 (or newer): .. code-block:: none - $ sudo swupd update -m 26200 # or newer version + $ sudo swupd update -m 26770 # or newer version #. Use the ``sudo swupd bundle-add`` command and add these Clear Linux bundles: @@ -118,9 +118,9 @@ partition. Follow these steps: $ sudo ls -1 /boot/EFI/org.clearlinux bootloaderx64.efi - kernel-org.clearlinux.native.4.19.1-654 - kernel-org.clearlinux.iot-lts2018-sos.4.19.0-19 - kernel-org.clearlinux.iot-lts2018.4.19.0-19 + kernel-org.clearlinux.native.4.19.8-670 + kernel-org.clearlinux.iot-lts2018-sos.4.19.5-29 + kernel-org.clearlinux.iot-lts2018.4.19.5-29 kernel-org.clearlinux.pk414-sos.4.14.74-115 loaderx64.efi @@ -247,9 +247,9 @@ partition. Follow these steps: :caption: ACRN Service OS Boot Menu => The ACRN Service OS - Clear Linux OS for Intel Architecture (Clear-linux-iot-lts2018-4.19.0-19) - Clear Linux OS for Intel Architecture (Clear-linux-iot-lts2018-sos-4.19.0-19) - Clear Linux OS for Intel Architecture (Clear-linux-native.4.19.1-654) + Clear Linux OS for Intel Architecture (Clear-linux-iot-lts2018-4.19.5-29) + Clear Linux OS for Intel Architecture (Clear-linux-iot-lts2018-sos-4.19.5-29) + Clear Linux OS for Intel Architecture (Clear-linux-native.4.19.8-670) EFI Default Loader Reboot Into Firmware Interface @@ -288,14 +288,14 @@ Set up Reference UOS ==================== #. On your platform, download the pre-built reference Clear Linux UOS - image version 26200 (or newer) into your (root) home directory: + image version 26770 (or newer) into your (root) home directory: .. code-block:: none $ cd ~ $ mkdir uos $ cd uos - $ curl -O https://download.clearlinux.org/releases/26200/clear/clear-26200-kvm.img.xz + $ curl -O https://download.clearlinux.org/releases/26770/clear/clear-26770-kvm.img.xz .. note:: In case you want to use or try out a newer version of Clear Linux as the UOS, you can @@ -306,16 +306,16 @@ Set up Reference UOS .. code-block:: none - $ unxz clear-26200-kvm.img.xz + $ unxz clear-26770-kvm.img.xz #. Deploy the UOS kernel modules to UOS virtual disk image (note: you'll need to use the same **iot-lts2018** image version number noted in step 1 above): .. code-block:: none - $ sudo losetup -f -P --show clear-26200-kvm.img + $ sudo losetup -f -P --show clear-26770-kvm.img $ sudo mount /dev/loop0p3 /mnt - $ sudo cp -r /usr/lib/modules/4.19.0-19.iot-lts2018 /mnt/lib/modules/ + $ sudo cp -r /usr/lib/modules/4.19.5-29.iot-lts2018 /mnt/lib/modules/ $ sudo umount /mnt $ sync @@ -334,7 +334,7 @@ Set up Reference UOS .. note:: In case you have downloaded a different Clear Linux image than the one above - (``clear-26200-kvm.img.xz``), you will need to modify the Clear Linux file name + (``clear-26770-kvm.img.xz``), you will need to modify the Clear Linux file name and version number highlighted above (the ``-s 3,virtio-blk`` argument) to match what you have downloaded above. Likewise, you may need to adjust the kernel file name on the second line highlighted (check the exact name to be used using: diff --git a/hypervisor/bsp/uefi/clearlinux/acrn.conf b/hypervisor/bsp/uefi/clearlinux/acrn.conf index 375ed4bda..2f8bd8d01 100755 --- a/hypervisor/bsp/uefi/clearlinux/acrn.conf +++ b/hypervisor/bsp/uefi/clearlinux/acrn.conf @@ -1,3 +1,3 @@ title The ACRN Service OS -linux /EFI/org.clearlinux/kernel-org.clearlinux.iot-lts2018-sos.4.19.0-16 +linux /EFI/org.clearlinux/kernel-org.clearlinux.iot-lts2018-sos.4.19.5-29 options console=tty0 console=ttyS0 i915.nuclear_pageflip=1 root=PARTUUID= rw rootwait ignore_loglevel no_timer_check consoleblank=0 i915.tsd_init=7 i915.tsd_delay=2000 i915.avail_planes_per_pipe=0x01010F i915.domain_plane_owners=0x011111110000 i915.enable_guc_loading=0 i915.enable_guc_submission=0 i915.enable_preemption=1 i915.context_priority_mode=2 i915.enable_gvt=1 i915.enable_guc=0 hvlog=2M@0x1FE00000