From 1c8ebc4fc124cda592f8e0854ffed7312daf409c Mon Sep 17 00:00:00 2001 From: Alexandru Costache Date: Tue, 26 Nov 2024 15:04:58 +0200 Subject: [PATCH] hw.device-type: switch to using flashProtocol: jetsonFlashDirect ... for devices which have detailed instructions in the jetson-flash repository. Devices which are SD-CARD flashers stay un-changed, so do community boards which don't have dedicated pages in the jetson-flash documentation. Change-type: patch Signed-off-by: Alexandru Costache --- .../jetson-agx-orin-devkit-64gb/contract.json | 13 ++++--------- .../jetson-agx-orin-devkit/contract.json | 2 +- .../jetson-nano-2gb-devkit/contract.json | 2 +- .../hw.device-type/jetson-nano-emmc/contract.json | 2 +- contracts/hw.device-type/jetson-nano/contract.json | 2 +- .../jetson-orin-nano-devkit-nvme/contract.json | 12 +++--------- .../jetson-orin-nano-seeed-j3010/contract.json | 12 +++--------- .../jetson-orin-nx-seeed-j4012/contract.json | 12 +++--------- .../jetson-orin-nx-xavier-nx-devkit/contract.json | 12 +++--------- .../jetson-tx2-nx-devkit/contract.json | 2 +- .../jetson-xavier-nx-devkit-emmc/contract.json | 2 +- .../contract.json | 1 + .../jetson-xavier-nx-devkit/contract.json | 2 +- .../hw.device-type/jetson-xavier/contract.json | 2 +- 14 files changed, 25 insertions(+), 53 deletions(-) diff --git a/contracts/hw.device-type/jetson-agx-orin-devkit-64gb/contract.json b/contracts/hw.device-type/jetson-agx-orin-devkit-64gb/contract.json index f6e8d5a9..e448d6f7 100644 --- a/contracts/hw.device-type/jetson-agx-orin-devkit-64gb/contract.json +++ b/contracts/hw.device-type/jetson-agx-orin-devkit-64gb/contract.json @@ -21,19 +21,14 @@ "storage": { "internal": true }, + "flashProtocol": "jetsonFlashDirect", "media": { - "defaultBoot": "internal", - "altBoot": ["usb_mass_storage"] + "defaultBoot": "internal" }, "is_private": false }, "partials": { - "bootDeviceExternal": [ - "Put the device in force recovery mode.", - "Connect the USB-C data port of the Devkit to the Host PC.", - "Boot the device from the inserted USB Key by following the AGX Orin Devkit 64GB flashing steps." - ], - "flashIndicator": ["power LED is off"], - "bootDevice": ["Power up the {{name}}"] + "bootDevice": ["Connect power to the {{name}}"] } + } diff --git a/contracts/hw.device-type/jetson-agx-orin-devkit/contract.json b/contracts/hw.device-type/jetson-agx-orin-devkit/contract.json index 16018bb8..1d15d044 100644 --- a/contracts/hw.device-type/jetson-agx-orin-devkit/contract.json +++ b/contracts/hw.device-type/jetson-agx-orin-devkit/contract.json @@ -21,7 +21,7 @@ "storage": { "internal": true }, - "flashProtocol": "jetsonFlash", + "flashProtocol": "jetsonFlashDirect", "media": { "defaultBoot": "internal" }, diff --git a/contracts/hw.device-type/jetson-nano-2gb-devkit/contract.json b/contracts/hw.device-type/jetson-nano-2gb-devkit/contract.json index 2de69cdb..cb4218ff 100644 --- a/contracts/hw.device-type/jetson-nano-2gb-devkit/contract.json +++ b/contracts/hw.device-type/jetson-nano-2gb-devkit/contract.json @@ -21,7 +21,7 @@ "storage": { "internal": false }, - "flashProtocol": "jetsonFlash", + "flashProtocol": "jetsonFlashDirect", "media": { "defaultBoot": "sdcard" }, diff --git a/contracts/hw.device-type/jetson-nano-emmc/contract.json b/contracts/hw.device-type/jetson-nano-emmc/contract.json index e151d465..18bdd4ab 100644 --- a/contracts/hw.device-type/jetson-nano-emmc/contract.json +++ b/contracts/hw.device-type/jetson-nano-emmc/contract.json @@ -21,7 +21,7 @@ "storage": { "internal": true }, - "flashProtocol": "jetsonFlash", + "flashProtocol": "jetsonFlashDirect", "media": { "defaultBoot": "internal" }, diff --git a/contracts/hw.device-type/jetson-nano/contract.json b/contracts/hw.device-type/jetson-nano/contract.json index ee9ceebd..0c7f49dc 100644 --- a/contracts/hw.device-type/jetson-nano/contract.json +++ b/contracts/hw.device-type/jetson-nano/contract.json @@ -21,7 +21,7 @@ "storage": { "internal": false }, - "flashProtocol": "jetsonFlash", + "flashProtocol": "jetsonFlashDirect", "media": { "defaultBoot": "sdcard" }, diff --git a/contracts/hw.device-type/jetson-orin-nano-devkit-nvme/contract.json b/contracts/hw.device-type/jetson-orin-nano-devkit-nvme/contract.json index bb99f37b..0fae59b4 100644 --- a/contracts/hw.device-type/jetson-orin-nano-devkit-nvme/contract.json +++ b/contracts/hw.device-type/jetson-orin-nano-devkit-nvme/contract.json @@ -21,19 +21,13 @@ "storage": { "internal": true }, + "flashProtocol": "jetsonFlashDirect", "media": { - "defaultBoot": "internal", - "altBoot": ["usb_mass_storage"] + "defaultBoot": "internal" }, "is_private": false }, "partials": { - "bootDeviceExternal": [ - "Insert a NVME drive in the carrier board and put the device in force recovery mode.", - "Connect the USB-C port of the carrier board to the Host PC.", - "RCM boot the balenaOS kernel following the Orin Nano Flashing steps." - ], - "flashIndicator": ["power LED is off"], - "bootDevice": ["Remove recovery mode jumper and power up the {{name}}"] + "bootDevice": ["Connect power to the {{name}}"] } } diff --git a/contracts/hw.device-type/jetson-orin-nano-seeed-j3010/contract.json b/contracts/hw.device-type/jetson-orin-nano-seeed-j3010/contract.json index a0693de0..03a5d550 100644 --- a/contracts/hw.device-type/jetson-orin-nano-seeed-j3010/contract.json +++ b/contracts/hw.device-type/jetson-orin-nano-seeed-j3010/contract.json @@ -21,19 +21,13 @@ "storage": { "internal": true }, + "flashProtocol": "jetsonFlashDirect", "media": { - "defaultBoot": "internal", - "altBoot": ["usb_mass_storage"] + "defaultBoot": "internal" }, "is_private": false }, "partials": { - "bootDeviceExternal": [ - "Put the device in force recovery mode.", - "Connect the USB-C port of the carrier board to the Host PC.", - "RCM boot the balenaOS kernel following the Seeed reComputer J3010 Flashing steps." - ], - "flashIndicator": ["power LED is off"], - "bootDevice": ["Remove recovery mode jumper and power up the {{name}}"] + "bootDevice": ["Connect power to the {{name}}"] } } diff --git a/contracts/hw.device-type/jetson-orin-nx-seeed-j4012/contract.json b/contracts/hw.device-type/jetson-orin-nx-seeed-j4012/contract.json index 98546cdb..361e720c 100644 --- a/contracts/hw.device-type/jetson-orin-nx-seeed-j4012/contract.json +++ b/contracts/hw.device-type/jetson-orin-nx-seeed-j4012/contract.json @@ -21,19 +21,13 @@ "storage": { "internal": true }, + "flashProtocol": "jetsonFlashDirect", "media": { - "defaultBoot": "internal", - "altBoot": ["usb_mass_storage"] + "defaultBoot": "internal" }, "is_private": false }, "partials": { - "bootDeviceExternal": [ - "Put the device in force recovery mode.", - "Connect the USB-C port of the carrier board to the Host PC.", - "RCM boot the balenaOS kernel following the Seeed reComputer J4012 Flashing steps." - ], - "flashIndicator": ["power LED is off"], - "bootDevice": ["Remove recovery mode jumper and power up the {{name}}"] + "bootDevice": ["Connect power to the {{name}}"] } } diff --git a/contracts/hw.device-type/jetson-orin-nx-xavier-nx-devkit/contract.json b/contracts/hw.device-type/jetson-orin-nx-xavier-nx-devkit/contract.json index fead8fb0..c71542bf 100644 --- a/contracts/hw.device-type/jetson-orin-nx-xavier-nx-devkit/contract.json +++ b/contracts/hw.device-type/jetson-orin-nx-xavier-nx-devkit/contract.json @@ -21,19 +21,13 @@ "storage": { "internal": true }, + "flashProtocol": "jetsonFlashDirect", "media": { - "defaultBoot": "internal", - "altBoot": ["usb_mass_storage"] + "defaultBoot": "internal" }, "is_private": false }, "partials": { - "bootDeviceExternal": [ - "Insert a NVME drive in the carrier board and put the device in force recovery mode.", - "Connect the micro-USB port of the carrier board to the Host PC.", - "RCM boot the balenaOS kernel following the Orin NX Flashing steps." - ], - "flashIndicator": ["power LED is off"], - "bootDevice": ["Remove recovery mode jumper and power up the {{name}}"] + "bootDevice": ["Connect power to the {{name}}"] } } diff --git a/contracts/hw.device-type/jetson-tx2-nx-devkit/contract.json b/contracts/hw.device-type/jetson-tx2-nx-devkit/contract.json index 9cac1804..0976523f 100644 --- a/contracts/hw.device-type/jetson-tx2-nx-devkit/contract.json +++ b/contracts/hw.device-type/jetson-tx2-nx-devkit/contract.json @@ -21,7 +21,7 @@ "storage": { "internal": true }, - "flashProtocol": "jetsonFlash", + "flashProtocol": "jetsonFlashDirect", "media": { "defaultBoot": "internal" }, diff --git a/contracts/hw.device-type/jetson-xavier-nx-devkit-emmc/contract.json b/contracts/hw.device-type/jetson-xavier-nx-devkit-emmc/contract.json index 577a9277..47f0841a 100644 --- a/contracts/hw.device-type/jetson-xavier-nx-devkit-emmc/contract.json +++ b/contracts/hw.device-type/jetson-xavier-nx-devkit-emmc/contract.json @@ -21,7 +21,7 @@ "storage": { "internal": true }, - "flashProtocol": "jetsonFlash", + "flashProtocol": "jetsonFlashDirect", "media": { "defaultBoot": "internal" }, diff --git a/contracts/hw.device-type/jetson-xavier-nx-devkit-seeed-2mic-hat/contract.json b/contracts/hw.device-type/jetson-xavier-nx-devkit-seeed-2mic-hat/contract.json index 8a2fc2b8..34049b5f 100644 --- a/contracts/hw.device-type/jetson-xavier-nx-devkit-seeed-2mic-hat/contract.json +++ b/contracts/hw.device-type/jetson-xavier-nx-devkit-seeed-2mic-hat/contract.json @@ -21,6 +21,7 @@ "storage": { "internal": false }, + "flashProtocol": "jetsonFlash", "media": { "defaultBoot": "sdcard" }, diff --git a/contracts/hw.device-type/jetson-xavier-nx-devkit/contract.json b/contracts/hw.device-type/jetson-xavier-nx-devkit/contract.json index 097beae7..914cd30c 100644 --- a/contracts/hw.device-type/jetson-xavier-nx-devkit/contract.json +++ b/contracts/hw.device-type/jetson-xavier-nx-devkit/contract.json @@ -21,7 +21,7 @@ "storage": { "internal": false }, - "flashProtocol": "jetsonFlash", + "flashProtocol": "jetsonFlashDirect", "media": { "defaultBoot": "sdcard" }, diff --git a/contracts/hw.device-type/jetson-xavier/contract.json b/contracts/hw.device-type/jetson-xavier/contract.json index 5dbdc076..dc01f328 100644 --- a/contracts/hw.device-type/jetson-xavier/contract.json +++ b/contracts/hw.device-type/jetson-xavier/contract.json @@ -21,7 +21,7 @@ "storage": { "internal": true }, - "flashProtocol": "jetsonFlash", + "flashProtocol": "jetsonFlashDirect", "media": { "defaultBoot": "internal" },