From 3b7a010f7f26c7b18969804ae64b013773d98388 Mon Sep 17 00:00:00 2001 From: wenlingz Date: Fri, 15 Feb 2019 20:48:00 +0800 Subject: [PATCH] Revert "Documentation: tweak GSG (and acrn.conf)" This reverts commit c85172c3427f8f9040af7b783a8a92efd9c582a9. --- doc/getting-started/apl-nuc.rst | 22 ++++++++-------------- efi-stub/clearlinux/acrn.conf | 2 +- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/doc/getting-started/apl-nuc.rst b/doc/getting-started/apl-nuc.rst index 521a6d4a2..89c90583c 100644 --- a/doc/getting-started/apl-nuc.rst +++ b/doc/getting-started/apl-nuc.rst @@ -121,12 +121,12 @@ partition. Follow these steps: $ sudo ls -1 /boot/EFI/org.clearlinux bootloaderx64.efi - kernel-org.clearlinux.iot-lts2018.4.19.19-8 - kernel-org.clearlinux.iot-lts2018-sos.4.19.19-8 - kernel-org.clearlinux.native.4.20.7-694 + kernel-org.clearlinux.native.4.20.2-683 + kernel-org.clearlinux.iot-lts2018-sos.4.19.13-1901141830 + kernel-org.clearlinux.iot-lts2018.4.19.13-1901141830 + kernel-org.clearlinux.pk414-sos.4.14.74-115 loaderx64.efi - .. note:: On Clear Linux OS, the EFI System Partion (e.g.: ``/dev/sda1``) is mounted under ``/boot`` by default The Clear Linux project releases updates often, sometimes @@ -232,13 +232,7 @@ partition. Follow these steps: (``root=PARTUUID=``) in the ``options`` section, and add the ``hugepagesz=1G hugepages=2`` at end of the ``options`` section. - Use ``blkid`` to find out what your ``/dev/sda3`` ``PARTUUID`` value is. Here - is a handy one-line command to do that: - - .. code-block:: none - - # sed -i "s//`blkid -s PARTUUID -o value \ - /dev/sda3`/g" /boot/loader/entries/acrn.conf + Use ``blkid`` to find out what your ``/dev/sda3`` ``PARTUUID`` value is. .. note:: It is also possible to use the device name directly, e.g. ``root=/dev/sda3`` @@ -260,9 +254,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.19-8) - Clear Linux OS for Intel Architecture (Clear-linux-iot-lts2018-sos-4.19.19-8) - Clear Linux OS for Intel Architecture (Clear-linux-native.4.20.7-694) + Clear Linux OS for Intel Architecture (Clear-linux-iot-lts2018-4.19.13-1901141830) + Clear Linux OS for Intel Architecture (Clear-linux-iot-lts2018-sos-4.19.13-1901141830) + Clear Linux OS for Intel Architecture (Clear-linux-native.4.20.2-683) EFI Default Loader Reboot Into Firmware Interface diff --git a/efi-stub/clearlinux/acrn.conf b/efi-stub/clearlinux/acrn.conf index e6785dba5..0958b85e7 100755 --- a/efi-stub/clearlinux/acrn.conf +++ b/efi-stub/clearlinux/acrn.conf @@ -1,3 +1,3 @@ title The ACRN Service OS -linux /EFI/org.clearlinux/kernel-org.clearlinux.iot-lts2018-sos.4.19.19-8 +linux /EFI/org.clearlinux/kernel-org.clearlinux.iot-lts2018-sos.4.19.13-1901141830 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