From 958ea0f11b5fe34c7633bdbc10733951c38144e4 Mon Sep 17 00:00:00 2001 From: lirui34 Date: Fri, 8 Nov 2019 18:55:03 +0800 Subject: [PATCH] doc: Stop using kconfig to make a customized efi. Also fix some quick setup script issues. Signed-off-by: lirui34 --- doc/faq.rst | 52 +++++++++---------------- doc/getting-started/acrn_quick_setup.sh | 10 ++--- doc/getting-started/rt_industry.rst | 6 +-- 3 files changed, 26 insertions(+), 42 deletions(-) diff --git a/doc/faq.rst b/doc/faq.rst index 841ada41b..77a11366f 100644 --- a/doc/faq.rst +++ b/doc/faq.rst @@ -49,46 +49,32 @@ For example, if the NUC's physical memory size is 32G, you may follow these step to make the new uefi ACRN hypervisor, and then deploy it onto the NUC board to boot ACRN Service VM with the 32G memory size. -#. Modify the ``hypervisor/arch/x86/Kconfig`` from the ACRN source on host machine. +#. Use ``make menuconfig`` to change the ``RAM_SIZE``:: - :: - - config HV_RAM_SIZE - hex "Size of the RAM region used by the hypervisor" - - default 0x0b800000 - + default 0x0f000000 - help - A 64-bit integer indicating the size of RAM used by the hypervisor. - It is ensured at link time that the footprint of the hypervisor - - :: - - config PLATFORM_RAM_SIZE - hex "Size of the physical platform RAM" - - default 0x400000000 - + default 0x800000000 - help - A 64-bit integer indicating the size of the physical platform RAM - (MMIO not included). - - :: - - config SOS_RAM_SIZE - hex "Size of the Service OS (SOS) RAM" - - default 0x400000000 - + default 0x800000000 - help - A 64-bit integer indicating the size of the Service OS RAM (MMIO not - included). + $ cd acrn-hypervisor + $ make menuconfig -C hypervisor BOARD=nuc7i7dnb -#. Use ``make BOARD=nuc7i7dnb FIRMWARE=uefi hypervisor`` command to build the new - efi image for KBL NUC. +#. Navigate to these items and then change the value as given below:: + + (0x0f000000) Size of the RAM region used by the hypervisor + (0x800000000) Size of the physical platform RAM + (0x800000000) Size of the Service OS (SOS) RAM + +#. Press :kbd:`S` and then :kbd:`Enter` to save the ``.config`` to the default directory: + ``acrn-hypervisor/hypervisor/build/.config`` + +#. Press :kbd:`ESC` to leave the menu. + +#. Use these command lines to build the new efi image for KBL NUC:: + + $ make -C hypervisor + $ make -C misc/efi-stub HV_OBJDIR=$PWD/hypervisor/build EFI_OBJDIR=$PWD/hypervisor/build #. Log in to your KBL NUC (assumes all the ACRN configurations are set up), then copy the new efi image into the EFI partition:: # mount /dev/sda1 /mnt - # scp -r :/build/hypervisor/acrn.efi /mnt/EFI/acrn/ + # scp -r @:/acrn-hypervisor/hypervisor/build/acrn.efi /mnt/EFI/acrn/ # sync && umount /mnt #. Reboot KBL NUC to enjoy the ACRN with 32G memory. diff --git a/doc/getting-started/acrn_quick_setup.sh b/doc/getting-started/acrn_quick_setup.sh index 1d2ad9994..e53ddb241 100644 --- a/doc/getting-started/acrn_quick_setup.sh +++ b/doc/getting-started/acrn_quick_setup.sh @@ -41,6 +41,8 @@ source /etc/os-release skip_download_uos=0 # switcher for disabling the reboot device disable_reboot=0 +# set default scenario name +scenario=sdc function upgrade_sos() { @@ -51,13 +53,11 @@ function upgrade_sos() echo "Upgrading Service VM..." # get board name - BOARD_NAME=`cat /sys/devices/virtual/dmi/id/board_name` + BOARD_NAME=`cat /sys/devices/virtual/dmi/id/board_name | cut -d' ' -f1` BOARD_NAME=${BOARD_NAME,,} [[ -z $BOARD_NAME ]] && echo "Unknown board name." && exit 1 echo "Board name is: $BOARD_NAME" - # set default scenario name - scenario=sdc - + # set up mirror and proxy url while specified with m and p options [[ -n $mirror ]] && echo "Setting swupd mirror to: $mirror" && swupd mirror -s $mirror [[ -n $proxy ]] && echo "Setting proxy to: $proxy" && export https_proxy=$proxy @@ -103,7 +103,7 @@ function upgrade_sos() umount /mnt && sync exit 1 fi - cp -a $acrn_efi_path /mnt/EFI/acrn/acrn.efi + cp -r $acrn_efi_path /mnt/EFI/acrn/acrn.efi if [[ $? -ne 0 ]]; then echo "Failed to copy $acrn_efi_path" && exit 1; fi new_kernel=`ls /usr/lib/kernel/org*sos* -tl | head -n1 | awk -F'/' '{print $5}'` diff --git a/doc/getting-started/rt_industry.rst b/doc/getting-started/rt_industry.rst index 9ad9e2938..f1f5fd974 100644 --- a/doc/getting-started/rt_industry.rst +++ b/doc/getting-started/rt_industry.rst @@ -99,10 +99,8 @@ Hardware Setup +----------------------+-------------------+----------------------+-----------------------------------------------------------+ .. [1] The maximum supported memory size for ACRN is 16GB. If you are using - 32GB memory, follow the :ref:`config_32GB_memory` instruction to modify the - ``hypervisor/arch/x86/Kconfig`` and then use ``make FIRMWARE=uefi BOARD=nuc7i7dnb - SCENARIO=industry hypervisor`` command to make the latest ACRN hypervisor - which is supported 32GB memory. For more detailed instruction about how to build ACRN + 32GB memory, follow the :ref:`config_32GB_memory` instruction to make the customized ACRN hypervisor + which is supported 32GB memory. For more detailed information about how to build ACRN from the source code, refer to this :ref:`guide `. Set up the ACRN Hypervisor for industry scenario