Skip to content

Commit ca27f8e

Browse files
leiluwenlingz
authored andcommitted
update using_sbl_on_up2 doc and create-up2-images.sh
1. Fix the broken link to dwonload UP2 Board BIOS 2. In Clear Linux 31030 the acrn.apl-up2.sbl name is changed to acrn.apl-up2.sbl.sdc.32.out, so we need to update the creaet-up2-imgages.sh 3. Command "swupd verify --install -m" has been superseded, use "swupd os-install -V" instead. Signed-off-by: Lei, Lu <leix.lu@intel.com>
1 parent 36d52c7 commit ca27f8e

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

doc/tutorials/create-up2-images.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,21 @@ create_sos_images() {
3434

3535
mountpoint sos_rootfs || return 1
3636

37-
swupd verify --install --path=sos_rootfs --contenturl=$MIRRORURL --versionurl=$MIRRORURL --format=staging -m ${VERSION} ||
37+
swupd os-install --path=sos_rootfs --contenturl=$MIRRORURL --versionurl=$MIRRORURL --format=staging -V ${VERSION} -N -b ||
3838
{
3939
echo "Failed to swupd install"
4040
return 1
4141
}
4242

43-
swupd bundle-add $SOS_BUNDLE_LIST --path=sos_rootfs --contenturl=$MIRRORURL --versionurl=$MIRRORURL --format=staging ||
43+
swupd bundle-add --path=sos_rootfs --contenturl=$MIRRORURL --versionurl=$MIRRORURL --format=staging $SOS_BUNDLE_LIST ||
4444
{
4545
echo "Failed to swupd bundle add"
4646
return 1
4747
}
4848

4949
if [[ ! ${ACRN_SBL} || ! -f ${ACRN_SBL} ]]
5050
then
51-
ACRN_SBL=sos_rootfs/usr/lib/acrn/acrn.apl-up2.sbl
51+
ACRN_SBL=sos_rootfs/usr/lib/acrn/acrn.apl-up2.sbl.sdc.32.out
5252
fi
5353

5454
if [ ${ACRN_HV_CODE_PATH} ]

doc/tutorials/using_sbl_on_up2.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ BIOS binary file ``<SBL_IFWI_IMAGE>``, which is the new IFWI image with SBL in B
5656
Flash SBL on the UP2
5757
********************
5858

59-
#. Download the appropriate BIOS update for `UP2 Board <https://downloads.up-community.org/download/up-board-uefi-bios-upc1dm15/>`_.
59+
#. Download the appropriate BIOS update for `UP2 Board <https://downloads.up-community.org/download/up-board-uefi-bios-upc1dm17/>`_.
6060
#. Put the empty USB flash drive in your PC and format it as FAT32.
6161
#. Decompress the BIOS zip file into the formatted drive.
6262
#. Attach the USB disk and keyboard to the board and power it on.
@@ -95,14 +95,14 @@ An example of the configuration file ``uos.json``:
9595
{ "disk" : "clearlinux.img", "partition" : 2, "type" : "ext4" } ],
9696
"PartitionMountPoints" : [ { "disk" : "clearlinux.img", "partition" : 1, "mount" : "/boot" },
9797
{ "disk" : "clearlinux.img", "partition" : 2, "mount" : "/" } ],
98-
"Version": 30690,
98+
"Version": 31030,
9999
"Bundles": ["kernel-iot-lts2018", "openssh-server", "x11-server", "os-core", "os-core-update"]
100100
}
101101
102102
.. note::
103103
To generate the image with a specified version, please modify
104104
the "Version" argument, ``"Version": 3****`` instead
105-
of ``"Version": 30690`` for example.
105+
of ``"Version": 31030`` for example.
106106

107107

108108
Build SOS and LaaG image:
@@ -111,7 +111,7 @@ Build SOS and LaaG image:
111111
112112
$ sudo -s
113113
# chmod +x create-up2-images.sh
114-
# ./create-up2-images.sh --images-type all --clearlinux-version 30690 --laag-json uos.json
114+
# ./create-up2-images.sh --images-type all --clearlinux-version 31030 --laag-json uos.json
115115
116116
.. note::
117117
You must have root privileges to run ``create-up2-images.sh``.
@@ -122,7 +122,7 @@ Build SOS and LaaG image:
122122

123123
.. note::
124124
When building images, you can modify the ``--clearlinux-version`` argument
125-
to a specific version (such as 30690). To generate the images of SOS only,
125+
to a specific version (such as 31030). To generate the images of SOS only,
126126
modify the ``--images-type`` argument to ``sos``.
127127

128128
This step will generate the images of SOS and LaaG:

0 commit comments

Comments
 (0)