Skip to content

Commit 5b42a84

Browse files
author
Mattijs Korpershoek
committed
feat(android): Remove 6.1 kernel support
We have migrated to android15-6.6 kernel. Remove all mentions of the 6.1 kernel. Update the version in the release overview as well. Signed-off-by: Mattijs Korpershoek <[email protected]>
1 parent afcc18d commit 5b42a84

File tree

4 files changed

+6
-15
lines changed

4 files changed

+6
-15
lines changed

source/android/Foundational_Components_Kernel.rst

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Downloading sources
1515
.. code-block:: console
1616
1717
$ mkdir ${YOUR_PATH}/ti-kernel-aosp/ && cd $_
18-
$ repo init -u https://git.ti.com/git/android/manifest.git -b android15-release -m releases/RLS_10_01_Kernel.xml
18+
$ repo init -u https://git.ti.com/git/android/manifest.git -b android15-release -m releases/RLS_10_01_Kernel-6.6.xml
1919
$ repo sync
2020
2121
.. tip::
@@ -24,13 +24,7 @@ Downloading sources
2424

2525
.. code-block:: console
2626
27-
$ repo init -u https://git.ti.com/git/android/manifest.git -b android15-release -m releases/RLS_10_01_Kernel.xml --depth=1
28-
29-
A preview for the ``android15-6.6`` kernel is also available for testing via a dedicated manifest:
30-
31-
.. code-block:: console
32-
33-
$ repo init -u https://git.ti.com/git/android/manifest.git -b android15-release -m releases/RLS_10_01_Kernel-6.6.xml
27+
$ repo init -u https://git.ti.com/git/android/manifest.git -b android15-release -m releases/RLS_10_01_Kernel-6.6.xml --depth=1
3428
3529
.. _android-build-kernel:
3630

@@ -50,7 +44,7 @@ Building everything from scratch
5044
.. code-block:: console
5145
5246
$ cd ${YOUR_PATH}/ti-kernel-aosp/
53-
$ export TARGET_KERNEL_USE="6.1" # or "6.6" for experimental kernel
47+
$ export TARGET_KERNEL_USE="6.6"
5448
$ export DIST_DIR=${YOUR_PATH}/ti-aosp-15/device/ti/am62x-kernel/kernel/${TARGET_KERNEL_USE}
5549
$ tools/bazel run //common:ti_dist -- --dist_dir=$DIST_DIR
5650
@@ -66,7 +60,7 @@ Rebuilding faster
6660
.. code-block:: console
6761
6862
$ cd ${YOUR_PATH}/ti-kernel-aosp/
69-
$ export TARGET_KERNEL_USE="6.1" # or "6.6" for experimental kernel
63+
$ export TARGET_KERNEL_USE="6.6"
7064
$ export DIST_DIR=${YOUR_PATH}/ti-aosp-15/device/ti/am62x-kernel/kernel/${TARGET_KERNEL_USE}
7165
$ tools/bazel run --config=fast //common:ti_dist -- --dist_dir=$DIST_DIR
7266

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_KERNEL_USE``
132-
- **6.1**/6.6
133-
- Pick kernel version. 6.6 is experimental
134131
* - ``TARGET_BOOTLOADER_VERSION``
135132
- **unset**/2024.04
136133
- Pick U-Boot version (default: ``2023.04``). 2024.04 is experimental

source/devices/AM62PX/android/Release_Specific_Release_Notes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ SDK Components and Versions
5858
+====================================+===============================================================================+
5959
| **Android** | Android 15 / Android 15 Car |
6060
+------------------------------------+-------------------------------------------------------------------------------+
61-
| **Linux Kernel** | Linux 6.1.78 (6.6.30 preview available) |
61+
| **Linux Kernel** | Linux 6.6.56 |
6262
+------------------------------------+-------------------------------------------------------------------------------+
6363
| **Linux Kernel Toolchain** | clang-r487747c |
6464
+------------------------------------+-------------------------------------------------------------------------------+

source/devices/AM62X/android/Release_Specific_Release_Notes.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ SDK Components and Versions
5959
+====================================+===============================================================================+
6060
| **Android** | Android 15 / Android 15 Car |
6161
+------------------------------------+-------------------------------------------------------------------------------+
62-
| **Linux Kernel** | Linux 6.1.78 (6.6.30 preview available) |
62+
| **Linux Kernel** | Linux 6.6.56 |
6363
+------------------------------------+-------------------------------------------------------------------------------+
6464
| **Linux Kernel Toolchain** | clang-r487747c |
6565
+------------------------------------+-------------------------------------------------------------------------------+

0 commit comments

Comments
 (0)