Merge pull request #506 from bennyz/rcars4

add support for RcarS4

Author: mangelajo

.gitattributes

@@ -0,0 +1 @@
+packages/jumpstarter-driver-flashers/oci_bundles/rcar_s4/data/flasher.itb filter=lfs diff=lfs merge=lfs -text

packages/jumpstarter-driver-flashers/jumpstarter_driver_flashers/bundle.py

@@ -33,7 +33,7 @@ class FlashBundleSpecV1Alpha1(BaseModel):
     targets: dict[str, str]
     kernel: FileAddress
     initram: Optional[FileAddress] = None
-    dtb: DtbVariant
+    dtb: Optional[DtbVariant] = None
     preflash_commands: list[str] = Field(default_factory=list)
 
 
@@ -47,10 +47,15 @@ class FlasherBundleManifestV1Alpha1(BaseModel):
     metadata: ObjectMeta
     spec: FlashBundleSpecV1Alpha1
 
-    def get_dtb_address(self) -> str:
+    def get_dtb_address(self) -> str | None:
+        if not self.spec.dtb:
+            return None
         return self.spec.dtb.address
 
     def get_dtb_file(self, variant: str | None = None) -> str | None:
+        if not self.spec.dtb:
+            return None
+
         if not variant:
             variant = self.spec.dtb.default
 

packages/jumpstarter-driver-flashers/jumpstarter_driver_flashers/client.py

@@ -27,6 +27,7 @@
 EXPECT_TIMEOUT_DEFAULT = 60
 EXPECT_TIMEOUT_SYNC = 1200
 
+
 @dataclass(kw_only=True)
 class BaseFlasherClient(FlasherClient, CompositeClient):
     """
@@ -123,6 +124,10 @@ def flash(
                 target_device = self._get_target_device(target, manifest, console)
 
                 self.logger.info(f"Using target block device: {target_device}")
+                console.sendline(f"export dhcp_addr={self._dhcp_details.ip_address}")
+                console.expect(manifest.spec.login.prompt, timeout=EXPECT_TIMEOUT_DEFAULT)
+                console.sendline(f"export gw_addr={self._dhcp_details.gateway}")
+                console.expect(manifest.spec.login.prompt, timeout=EXPECT_TIMEOUT_DEFAULT)
 
                 # Preflash commands are executed before the flash operation
                 # generally used to clean up boot entries in existing devices
@@ -412,15 +417,15 @@ def _busybox(self):
 
             # if manifest has login details, we need to login
             if manifest.spec.login.username:
-                console.expect(manifest.spec.login.login_prompt, timeout=EXPECT_TIMEOUT_DEFAULT*3)
+                console.expect(manifest.spec.login.login_prompt, timeout=EXPECT_TIMEOUT_DEFAULT * 3)
                 console.send(manifest.spec.login.username + "\n")
 
             # if manifest has password, we need to send it
             if manifest.spec.login.password:
                 console.expect("ssword:", timeout=EXPECT_TIMEOUT_DEFAULT)
                 console.send(manifest.spec.login.password + "\n")
 
-            console.expect(manifest.spec.login.prompt, timeout=EXPECT_TIMEOUT_DEFAULT*3)
+            console.expect(manifest.spec.login.prompt, timeout=EXPECT_TIMEOUT_DEFAULT * 3)
             yield console
 
     def use_dtb(self, path: PathBuf, operator: Operator | None = None):

packages/jumpstarter-driver-flashers/jumpstarter_driver_flashers/driver.py

@@ -84,9 +84,10 @@ async def setup_flasher_bundle(self, force_flash_bundle: str | None = None):
             self.logger.info(f"Setting up initram in tftp: {initram_path}")
             await self.tftp.storage.copy_exporter_file(initram_path, initram_path.name)
 
-        dtb_path = await self._get_file_path(manifest.get_dtb_file(self._use_dtb))
-        self.logger.info(f"Setting up dtb in tftp: {dtb_path}")
-        await self.tftp.storage.copy_exporter_file(dtb_path, dtb_path.name)
+        dtb_path = await self._get_file_path(manifest.get_dtb_file(self._use_dtb)) if manifest.spec.dtb else None
+        if dtb_path:
+            self.logger.info(f"Setting up dtb in tftp: {dtb_path}")
+            await self.tftp.storage.copy_exporter_file(dtb_path, dtb_path.name)
 
     @export
     def set_dtb(self, handle):
@@ -202,3 +203,10 @@ class TIJ784S4Flasher(BaseFlasher):
     """driver for Jumpstarter"""
 
     flasher_bundle: str = "quay.io/jumpstarter-dev/jumpstarter-flasher-ti-j784s4:latest"
+
+
+@dataclass(kw_only=True)
+class RCarS4Flasher(BaseFlasher):
+    """RCarS4 driver for Jumpstarter"""
+
+    flasher_bundle: str = "quay.io/jumpstarter-dev/jumpstarter-flasher-rcar-s4:latest"

packages/jumpstarter-driver-flashers/oci_bundles/rcar_s4/data/.keep

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f6dc11643eace8728115eaedd7a372c9f4a6402e937d63a3dd653e10d87855cc
+size 52413672

packages/jumpstarter-driver-flashers/oci_bundles/rcar_s4/data/flasher.itb

@@ -0,0 +1,19 @@
+apiVersion: jumpstarter.dev/v1alpha1
+kind: FlashBundleManifest
+metadata:
+  name: rcar-s4
+spec:
+  manufacturer: Renesas
+  link: "https://www.renesas.com/en/products/automotive-products/automotive-system-chips-socs/r-car-s4-automotive-system-chip-soc-car-servercommunication-gateway"
+  bootcmd: "bootm 0x58000000"
+  shelltype: "busybox"
+  login:
+    login_prompt: "login:"
+    username: "root"
+    prompt: "#"
+  default_target: "emmc"
+  targets:
+    emmc: "/dev/mmcblk0"
+  kernel:
+    file: data/flasher.itb
+    address: "0x58000000"

packages/jumpstarter-driver-flashers/oci_bundles/rcar_s4/manifest.yaml

@@ -1,15 +1,31 @@
 from dataclasses import dataclass
 
+import click
+from jumpstarter_driver_power.client import PowerClient
+
 from jumpstarter.client import DriverClient
 
 
 @dataclass(kw_only=True)
-class DigitalOutputClient(DriverClient):
-    def off(self) -> None:
+class DigitalOutputClient(PowerClient):
+    def on(self):
+        """Turn power on"""
+        self.call("on")
+
+    def off(self):
+        """Turn power off"""
         self.call("off")
 
-    def on(self) -> None:
-        self.call("on")
+    def cli(self):
+        @click.group()
+        def gpio():
+            """GPIO power control commands"""
+            pass
+
+        for cmd in super().cli().commands.values():
+            gpio.add_command(cmd)
+
+        return gpio
 
 
 @dataclass(kw_only=True)

packages/jumpstarter-driver-raspberrypi/jumpstarter_driver_raspberrypi/client.py

@@ -10,7 +10,7 @@ authors = [
 readme = "README.md"
 license = "Apache-2.0"
 requires-python = ">=3.11"
-dependencies = ["jumpstarter", "gpiozero>=2.0.1"]
+dependencies = ["jumpstarter", "jumpstarter-driver-power", "gpiozero>=2.0.1", "click>=8.1.7.2"]
 
 [project.entry-points."jumpstarter.drivers"]
 DigitalInput = "jumpstarter_driver_raspberrypi.driver:DigitalInput"