feature(v3.7.x): bootcontrol: refactor jetson-cboot, add new firmware update support

otaclient/app/boot_control/configs.py

@@ -15,7 +15,7 @@
 
 from __future__ import annotations
 from dataclasses import dataclass, field
-from typing import Dict
+from typing import Dict, List
 
 from ..configs import BaseConfig
 
@@ -36,20 +36,25 @@ class GrubControlConfig(BaseConfig):
 
 
 @dataclass
-class CBootControlConfig(BaseConfig):
-    """arm platform, with cboot as bootloader.
+class JetsonCBootControlConfig(BaseConfig):
+    """Jetson device booted with cboot.
 
-    NOTE: only for tegraid:0x19, roscube-x platform(jetson-xavier-agx series)
+    Suuports BSP version < R34.
     """
 
     BOOTLOADER: BootloaderType = BootloaderType.CBOOT
     TEGRA_CHIP_ID_PATH: str = "/sys/module/tegra_fuse/parameters/tegra_chip_id"
     CHIP_ID_MODEL_MAP: Dict[int, str] = field(default_factory=lambda: {0x19: "rqx_580"})
     OTA_STATUS_DIR: str = "/boot/ota-status"
+    FIRMWARE_BSP_VERSION_FNAME: str = "firmware_bsp_version"
     EXTLINUX_FILE: str = "/boot/extlinux/extlinux.conf"
     SEPARATE_BOOT_MOUNT_POINT: str = "/mnt/standby_boot"
     # refer to the standby slot
-    FIRMWARE_CONFIG: str = "/opt/ota/firmwares/firmware.yaml"
+    FIRMWARE_DPATH: str = "/opt/ota_package"
+    FIRMWARE_LIST: List[str] = field(
+        default_factory=lambda: ["bl_only_payload", "xusb_only_payload"]
+    )
+    NV_TEGRA_RELEASE_FPATH: str = "/etc/nv_tegra_release"
 
 
 @dataclass
@@ -77,5 +82,5 @@ class RPIBootControlConfig(BaseConfig):
 
 
 grub_cfg = GrubControlConfig()
-cboot_cfg = CBootControlConfig()
+cboot_cfg = JetsonCBootControlConfig()
 rpi_boot_cfg = RPIBootControlConfig()

otaclient/app/boot_control/selecter.py

@@ -81,6 +81,13 @@ def get_boot_controller(
         from ._grub import GrubController
 
         return GrubController
+    if (
+        bootloader_type == BootloaderType.CBOOT
+        or bootloader_type == BootloaderType.JETSON_CBOOT
+    ):
+        from ._jetson_cboot import JetsonCBootControl
+
+        return JetsonCBootControl
     if bootloader_type == BootloaderType.RPI_BOOT:
         from ._rpi_boot import RPIBootController
 

otaclient/configs/ecu_info.py

@@ -43,7 +43,8 @@ class BootloaderType(str, Enum):
 
     AUTO_DETECT = "auto_detect"
     GRUB = "grub"
-    CBOOT = "cboot"
+    CBOOT = "cboot"  # deprecated, use jetson-cboot instead
+    JETSON_CBOOT = "jetson-cboot"
     RPI_BOOT = "rpi_boot"
 
     @staticmethod

otaclient/requirements.txt

@@ -10,5 +10,5 @@ aiohttp==3.8.5
 aiofiles==22.1.0
 zstandard==0.18.0
 typing_extensions==4.6.3
-pydantic==2.6.4
+pydantic==2.7.0
 pydantic-settings==2.2.1

tests/data/extlinux.conf-r35.4.1-template1

@@ -0,0 +1,30 @@
+TIMEOUT 30
+DEFAULT primary
+
+MENU TITLE L4T boot options
+
+LABEL primary
+      MENU LABEL primary kernel
+      LINUX /boot/Image
+      INITRD /boot/initrd
+FDT /boot/tegra234-orin-agx-cti-AGX201.dtb
+      APPEND ${cbootargs} rw rootwait rootfstype=ext4 mminit_loglevel=4 console=ttyTCU0,115200 console=ttyAMA0,115200 console=tty0 firmware_class.path=/etc/firmware fbcon=map:0 net.ifnames=0 nospectre_bhb
+
+# When testing a custom kernel, it is recommended that you create a backup of
+# the original kernel and add a new entry to this file so that the device can
+# fallback to the original kernel. To do this:
+#
+# 1, Make a backup of the original kernel
+#      sudo cp /boot/Image /boot/Image.backup
+#
+# 2, Copy your custom kernel into /boot/Image
+#
+# 3, Uncomment below menu setting lines for the original kernel
+#
+# 4, Reboot
+
+# LABEL backup
+#    MENU LABEL backup kernel
+#    LINUX /boot/Image.backup
+#    INITRD /boot/initrd
+#    APPEND ${cbootargs}

tests/data/extlinux.conf-r35.4.1-template2

@@ -0,0 +1,30 @@
+TIMEOUT 30
+DEFAULT primary
+
+MENU TITLE L4T boot options
+
+LABEL primary
+      MENU LABEL primary kernel
+      LINUX /boot/Image
+      INITRD /boot/initrd
+FDT /boot/tegra234-orin-agx-cti-AGX201.dtb
+      APPEND ${cbootargs} root=PARTUUID= rw rootwait rootfstype=ext4 mminit_loglevel=4 console=ttyTCU0,115200 console=ttyAMA0,115200 console=tty0 firmware_class.path=/etc/firmware fbcon=map:0 net.ifnames=0 nospectre_bhb
+
+# When testing a custom kernel, it is recommended that you create a backup of
+# the original kernel and add a new entry to this file so that the device can
+# fallback to the original kernel. To do this:
+#
+# 1, Make a backup of the original kernel
+#      sudo cp /boot/Image /boot/Image.backup
+#
+# 2, Copy your custom kernel into /boot/Image
+#
+# 3, Uncomment below menu setting lines for the original kernel
+#
+# 4, Reboot
+
+# LABEL backup
+#    MENU LABEL backup kernel
+#    LINUX /boot/Image.backup
+#    INITRD /boot/initrd
+#    APPEND ${cbootargs}

tests/data/extlinux.conf-r35.4.1-updated1

@@ -0,0 +1,30 @@
+TIMEOUT 30
+DEFAULT primary
+
+MENU TITLE L4T boot options
+
+LABEL primary
+      MENU LABEL primary kernel
+      LINUX /boot/Image
+      INITRD /boot/initrd
+FDT /boot/tegra234-orin-agx-cti-AGX201.dtb
+      APPEND ${cbootargs} rw rootwait rootfstype=ext4 mminit_loglevel=4 console=ttyTCU0,115200 console=ttyAMA0,115200 console=tty0 firmware_class.path=/etc/firmware fbcon=map:0 net.ifnames=0 nospectre_bhb root=PARTUUID=11aa-bbcc-22dd
+
+# When testing a custom kernel, it is recommended that you create a backup of
+# the original kernel and add a new entry to this file so that the device can
+# fallback to the original kernel. To do this:
+#
+# 1, Make a backup of the original kernel
+#      sudo cp /boot/Image /boot/Image.backup
+#
+# 2, Copy your custom kernel into /boot/Image
+#
+# 3, Uncomment below menu setting lines for the original kernel
+#
+# 4, Reboot
+
+# LABEL backup
+#    MENU LABEL backup kernel
+#    LINUX /boot/Image.backup
+#    INITRD /boot/initrd
+#    APPEND ${cbootargs}

tests/data/extlinux.conf-r35.4.1-updated2

@@ -0,0 +1,30 @@
+TIMEOUT 30
+DEFAULT primary
+
+MENU TITLE L4T boot options
+
+LABEL primary
+      MENU LABEL primary kernel
+      LINUX /boot/Image
+      INITRD /boot/initrd
+FDT /boot/tegra234-orin-agx-cti-AGX201.dtb
+      APPEND ${cbootargs} root=PARTUUID=11aa-bbcc-22dd rw rootwait rootfstype=ext4 mminit_loglevel=4 console=ttyTCU0,115200 console=ttyAMA0,115200 console=tty0 firmware_class.path=/etc/firmware fbcon=map:0 net.ifnames=0 nospectre_bhb
+
+# When testing a custom kernel, it is recommended that you create a backup of
+# the original kernel and add a new entry to this file so that the device can
+# fallback to the original kernel. To do this:
+#
+# 1, Make a backup of the original kernel
+#      sudo cp /boot/Image /boot/Image.backup
+#
+# 2, Copy your custom kernel into /boot/Image
+#
+# 3, Uncomment below menu setting lines for the original kernel
+#
+# 4, Reboot
+
+# LABEL backup
+#    MENU LABEL backup kernel
+#    LINUX /boot/Image.backup
+#    INITRD /boot/initrd
+#    APPEND ${cbootargs}