Skip to content

Commit 564cf76

Browse files
committed
feat(android): AM62X/AM62PX: update flash instructions
Android Verified Boot is enabled by default and can be disabled with the --disable-avb option. Remove deprecated AVB environment options from the documentation for build and bootloader. Mention it and add the new flash command line with the proper parameter to disable the feature if needed. Signed-off-by: Maxime Fournier <mfournier@baylibre.com>
1 parent 22b9722 commit 564cf76

File tree

4 files changed

+22
-18
lines changed

4 files changed

+22
-18
lines changed

source/android/Overview_Building_the_SDK.rst

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,11 @@ Where ``<BUILD_TARGET>`` is listed in the table below :
9999
The recommended ``<BUILD_TARGET>`` to use is ``am62p-ap3a-userdebug``.
100100

101101
It's possible to customize the standard build (``m``), by passing build flags.
102-
For example, the following enables AVB on userdebug builds:
102+
For example, the following enables ADB on user builds:
103103

104104
.. code-block:: console
105105
106-
$ TARGET_AVB_ENABLE=true m
106+
$ TARGET_ADB_USER_ENABLE=true m
107107
108108
The following build flags are available. **Default** values are **highlighted**.
109109

@@ -113,9 +113,6 @@ The following build flags are available. **Default** values are **highlighted**.
113113
* - Flag
114114
- Possible values
115115
- Description
116-
* - ``TARGET_AVB_ENABLE``
117-
- **false**/true
118-
- Forces AVB feature on userdebug
119116
* - ``TARGET_ADB_USER_ENABLE``
120117
- **false**/true
121118
- Forces enable ADB on user builds (**NOT for production builds**)

source/android/Overview_Flashing.rst

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -213,15 +213,6 @@ Once the build is complete, follow the steps below to flash the images to eMMC.
213213
## Resetting to default environment
214214
Saving Environment to MMC... Writing to MMC(0)... OK
215215
216-
.. note::
217-
218-
If you build with ``TARGET_AVB_ENABLE=true`` or flash user images you need to run this:
219-
220-
.. code-block:: console
221-
222-
=> setenv force_avb "1"; saveenv;
223-
Saving Environment to MMC... Writing to MMC(0)... OK
224-
225216
.. tip::
226217

227218
By default, no Device-Tree Overlays are selected.

source/devices/AM62PX/android/Application_Notes_Android_SD_CARD.rst

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,21 @@ Flashing SD Card
8888
- 01000000
8989
- 11000010
9090

91-
- Go in :file:`out` directory in android environment and launch this command:
91+
- Go in :file:`out` directory in android environment.
9292

9393
.. code-block:: console
9494
9595
$ cd out/target/product/am62p
9696
$ sudo ./flashall.sh --board="am62px-sk" --sdcard="/dev/sdX"
9797
98+
.. note::
99+
100+
To disable AVB, pass the ``--disable-avb`` argument to :file:`flashall.sh`:
101+
102+
.. code-block:: console
103+
104+
$ sudo ./flashall.sh --board="am62px-sk" --sdcard="/dev/sdX" --disable-avb
105+
98106
:file:`flashall.sh` **script print in your console instruction to do**
99107

100108
.. tip::

source/devices/AM62X/android/Application_Notes_Android_SD_CARD.rst

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,20 @@ Flashing SD Card
8989
- 01000000
9090
- 11000010
9191

92-
- Go in :file:`out` directory in android environment and launch this command:
92+
- Go in :file:`out` directory in android environment.
9393

9494
.. code-block:: console
9595
96-
$ cd out/target/product/am62x
97-
$ sudo ./flashall.sh --board="am62x-sk" --sdcard="/dev/sdX"
96+
$ cd out/target/product/am62p
97+
$ sudo ./flashall.sh --board="am62px-sk" --sdcard="/dev/sdX"
98+
99+
.. note::
100+
101+
To disable AVB, pass the ``--disable-avb`` argument to :file:`flashall.sh`:
102+
103+
.. code-block:: console
104+
105+
$ sudo ./flashall.sh --board="am62px-sk" --sdcard="/dev/sdX" --disable-avb
98106
99107
:file:`flashall.sh` **script print in your console instruction to do**
100108

0 commit comments

Comments
 (0)