Skip to content

Commit 4819a76

Browse files
author
Mattijs Korpershoek
committed
feat(android): Remove U-Boot 2023.04 support
With the SDK 10.1 release, only U-Boot 2024.04 is supported. Drop all mentions of U-Boot 2023.04, including the TARGET_BOOTLOADER_VERSION build variable. Signed-off-by: Mattijs Korpershoek <[email protected]>
1 parent 5b42a84 commit 4819a76

File tree

7 files changed

+6
-75
lines changed

7 files changed

+6
-75
lines changed

‎source/android/Overview_Building_the_SDK.rst‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,6 @@ The following build flags are available. **Default** values are **highlighted**.
128128
* - ``TARGET_SDCARD_BOOT``
129129
- **false**/true
130130
- Boot from SD card instead of eMMC
131-
* - ``TARGET_BOOTLOADER_VERSION``
132-
- **unset**/2024.04
133-
- Pick U-Boot version (default: ``2023.04``). 2024.04 is experimental
134131

135132
.. ifconfig:: CONFIG_part_variant in ('AM62X', 'AM62PX')
136133

‎source/devices/AM62PX/android/Application_Notes_Android_SD_CARD.rst‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,6 @@ Follow this link to download the :ref:`android-download-bootloaders`.
1515

1616
Apply this patch in U-Boot source code:
1717

18-
.. code-block:: diff
19-
20-
diff --git a/configs/am62x_android_a53.config b/configs/am62x_android_a53.config
21-
index fc949f65d7fe..d50952557192 100644
22-
--- a/configs/am62x_android_a53.config
23-
+++ b/configs/am62x_android_a53.config
24-
@@ -5,7 +5,7 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
25-
CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
26-
CONFIG_FASTBOOT_BUF_SIZE=0x2F000000
27-
CONFIG_FASTBOOT_FLASH=y
28-
-CONFIG_FASTBOOT_FLASH_MMC_DEV=0
29-
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1
30-
CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
31-
# Enable Android boot flow
32-
CONFIG_SYS_MALLOC_LEN=0x08000000
33-
34-
When using the the experimental ``2024.04`` U-Boot release apply this patch instead:
35-
3618
.. code-block:: diff
3719
3820
diff --git a/configs/am62x_a53_android.config b/configs/am62x_a53_android.config

‎source/devices/AM62PX/android/Application_Notes_dtbo_support.rst‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,9 @@ DTBOs can be enabled from U-Boot when extra peripherals are connected to the boa
1111

1212
DTBOs are **board specific**.
1313

14-
It's possible to change the ``dtbo_index`` from the U-Boot shell.
14+
It's possible to change the ``adtbo_idx`` from the U-Boot shell.
1515
For example:
1616

17-
.. code-block:: console
18-
19-
=> env set dtbo_index 1
20-
=> saveenv
21-
=> reset
22-
23-
To enable multiple DTBOs, pass a space-separated index list.
24-
For example:
25-
26-
.. code-block:: console
27-
28-
=> env set dtbo_index '1 2'
29-
30-
When using the the experimental ``2024.04`` U-Boot set the ``adtbo_idx`` variable instead:
31-
3217
.. code-block::
3318
3419
=> env set adtbo_idx 1
@@ -37,7 +22,7 @@ When using the the experimental ``2024.04`` U-Boot set the ``adtbo_idx`` variabl
3722
3823
.. warning::
3924

40-
With the experimental ``2024.04`` U-Boot, multiple DTBOs are **not supported**.
25+
Multiple DTBOs are **not supported**.
4126

4227
The following Device-Tree Overlays are supported:
4328

‎source/devices/AM62PX/android/Release_Specific_Release_Notes.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ SDK Components and Versions
6262
+------------------------------------+-------------------------------------------------------------------------------+
6363
| **Linux Kernel Toolchain** | clang-r487747c |
6464
+------------------------------------+-------------------------------------------------------------------------------+
65-
| **U-boot** | 2023.04 (2024.04 preview available) |
65+
| **U-boot** | 2024.04 |
6666
+------------------------------------+-------------------------------------------------------------------------------+
6767
| **GCC Toolchain** | GNU Toolchain for the A-profile Architecture 13.2 (rel1) |
6868
+------------------------------------+-------------------------------------------------------------------------------+

‎source/devices/AM62X/android/Application_Notes_Android_SD_CARD.rst‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,6 @@ Follow this link to download the :ref:`android-download-bootloaders`.
1616

1717
Apply this patch in U-Boot source code:
1818

19-
.. code-block:: diff
20-
21-
diff --git a/configs/am62x_android_a53.config b/configs/am62x_android_a53.config
22-
index fc949f65d7fe..d50952557192 100644
23-
--- a/configs/am62x_android_a53.config
24-
+++ b/configs/am62x_android_a53.config
25-
@@ -5,7 +5,7 @@ CONFIG_USB_FUNCTION_FASTBOOT=y
26-
CONFIG_FASTBOOT_BUF_ADDR=0xC0000000
27-
CONFIG_FASTBOOT_BUF_SIZE=0x2F000000
28-
CONFIG_FASTBOOT_FLASH=y
29-
-CONFIG_FASTBOOT_FLASH_MMC_DEV=0
30-
+CONFIG_FASTBOOT_FLASH_MMC_DEV=1
31-
CONFIG_FASTBOOT_CMD_OEM_FORMAT=y
32-
# Enable Android boot flow
33-
CONFIG_SYS_MALLOC_LEN=0x08000000
34-
35-
When using the the experimental ``2024.04`` U-Boot apply this patch instead:
36-
3719
.. code-block:: diff
3820
3921
diff --git a/configs/am62x_a53_android.config b/configs/am62x_a53_android.config

‎source/devices/AM62X/android/Application_Notes_dtbo_support.rst‎

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -11,24 +11,9 @@ DTBOs can be enabled from U-Boot when extra peripherals are connected to the boa
1111

1212
DTBOs are **board specific**.
1313

14-
It's possible to change the ``dtbo_index`` from the U-Boot shell.
14+
It's possible to change the ``adtbo_idx`` from the U-Boot shell.
1515
For example:
1616

17-
.. code-block:: console
18-
19-
=> env set dtbo_index 1
20-
=> saveenv
21-
=> reset
22-
23-
To enable multiple DTBOs, pass a space-separated index list.
24-
For example:
25-
26-
.. code-block:: console
27-
28-
=> env set dtbo_index '1 2'
29-
30-
When using the the experimental ``2024.04`` U-Boot set the ``adtbo_idx`` variable instead:
31-
3217
.. code-block::
3318
3419
=> env set adtbo_idx 1
@@ -37,7 +22,7 @@ When using the the experimental ``2024.04`` U-Boot set the ``adtbo_idx`` variabl
3722
3823
.. warning::
3924

40-
With the experimental ``2024.04`` U-Boot, multiple DTBOs are **not supported**.
25+
Multiple DTBOs are **not supported**.
4126

4227
The following Device-Tree Overlays are supported:
4328

‎source/devices/AM62X/android/Release_Specific_Release_Notes.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ SDK Components and Versions
6363
+------------------------------------+-------------------------------------------------------------------------------+
6464
| **Linux Kernel Toolchain** | clang-r487747c |
6565
+------------------------------------+-------------------------------------------------------------------------------+
66-
| **U-boot** | 2023.04 (2024.04 preview available) |
66+
| **U-boot** | 2024.04 |
6767
+------------------------------------+-------------------------------------------------------------------------------+
6868
| **GCC Toolchain** | GNU Toolchain for the A-profile Architecture 13.2 (rel1) |
6969
+------------------------------------+-------------------------------------------------------------------------------+

0 commit comments

Comments
 (0)