From ee7fde9bc92ad109f1ab548bd3f81872a8036e76 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 --- .../hw.device-type/jetson-agx-orin-devkit-64gb/contract.json | 5 +++-- .../hw.device-type/jetson-agx-orin-devkit/contract.json | 2 +- .../hw.device-type/jetson-nano-2gb-devkit/contract.json | 2 +- contracts/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 | 4 ++-- .../jetson-orin-nano-seeed-j3010/contract.json | 4 ++-- .../hw.device-type/jetson-orin-nx-seeed-j4012/contract.json | 4 ++-- .../jetson-orin-nx-xavier-nx-devkit/contract.json | 4 ++-- contracts/hw.device-type/jetson-tx2-nx-devkit/contract.json | 2 +- .../jetson-xavier-nx-devkit-emmc/contract.json | 2 +- .../jetson-xavier-nx-devkit-seeed-2mic-hat/contract.json | 1 + .../hw.device-type/jetson-xavier-nx-devkit/contract.json | 2 +- contracts/hw.device-type/jetson-xavier/contract.json | 2 +- 14 files changed, 20 insertions(+), 18 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..948c3aa5 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,9 +21,9 @@ "storage": { "internal": true }, + "flashProtocol": "jetsonFlashDirect", "media": { - "defaultBoot": "internal", - "altBoot": ["usb_mass_storage"] + "defaultBoot": "internal" }, "is_private": false }, @@ -36,4 +36,5 @@ "flashIndicator": ["power LED is off"], "bootDevice": ["Power up 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..2005eb61 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,9 +21,9 @@ "storage": { "internal": true }, + "flashProtocol": "jetsonFlashDirect", "media": { - "defaultBoot": "internal", - "altBoot": ["usb_mass_storage"] + "defaultBoot": "internal" }, "is_private": false }, 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..58c29d28 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,9 +21,9 @@ "storage": { "internal": true }, + "flashProtocol": "jetsonFlashDirect", "media": { - "defaultBoot": "internal", - "altBoot": ["usb_mass_storage"] + "defaultBoot": "internal" }, "is_private": false }, 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..3443411b 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,9 +21,9 @@ "storage": { "internal": true }, + "flashProtocol": "jetsonFlashDirect", "media": { - "defaultBoot": "internal", - "altBoot": ["usb_mass_storage"] + "defaultBoot": "internal" }, "is_private": false }, 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..094f7ee3 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,9 +21,9 @@ "storage": { "internal": true }, + "flashProtocol": "jetsonFlashDirect", "media": { - "defaultBoot": "internal", - "altBoot": ["usb_mass_storage"] + "defaultBoot": "internal" }, "is_private": false }, 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" },