From bb39871be0c3281181d9188c6c9e387099cae0fc Mon Sep 17 00:00:00 2001
From: Trong Nghia Nguyen <nghiant2710@gmail.com>
Date: Wed, 9 May 2018 09:49:36 +0700
Subject: [PATCH] Update comments

---
 contracts/arch.sw/armel/contract.json         | 12 ++++++------
 contracts/arch.sw/armhf/contract.json         | 19 ++++++++++++++-----
 contracts/arch.sw/armv7hf/contract.json       | 12 ++++++------
 contracts/arch.sw/rpi/contract.json           | 12 ++++++------
 .../boot-external.tpl                         |  0
 .../boot-internal.tpl                         |  0
 .../prepare-network.tpl                       |  0
 7 files changed, 32 insertions(+), 23 deletions(-)
 rename contracts/hw.device-type/{vab820-quad => via-vab820-quad}/boot-external.tpl (100%)
 rename contracts/hw.device-type/{vab820-quad => via-vab820-quad}/boot-internal.tpl (100%)
 rename contracts/hw.device-type/{vab820-quad => via-vab820-quad}/prepare-network.tpl (100%)

diff --git a/contracts/arch.sw/armel/contract.json b/contracts/arch.sw/armel/contract.json
index 08767067..b5cc061c 100644
--- a/contracts/arch.sw/armel/contract.json
+++ b/contracts/arch.sw/armel/contract.json
@@ -3,13 +3,13 @@
   "version": "1",
   "type": "arch.sw",
   "name": "ARM v5",
-  "arch": "armel",
+  "data": { "arch": "armel" },
   "requires": [
     {
-      "or": [
-        { "type": "hw.device-type", "arch": "armel" }
-      ]
+      "type": "hw.device-type",
+      "data": {
+        "arch": "armel"
+      }
     }
-  ],
-  "variants": ""
+  ]
 }
diff --git a/contracts/arch.sw/armhf/contract.json b/contracts/arch.sw/armhf/contract.json
index 3b1ec147..39a48fd2 100644
--- a/contracts/arch.sw/armhf/contract.json
+++ b/contracts/arch.sw/armhf/contract.json
@@ -3,14 +3,23 @@
   "version": "1",
   "type": "arch.sw",
   "name": "ARM Hard Float",
-  "arch": "armhf",
+  "data": { "arch": "armhf" },
   "requires": [
     {
       "or": [
-        { "type": "hw.device-type", "arch": "armv7hf" },
-        { "type": "hw.device-type", "arch": "rpi" }
+        {
+          "type": "hw.device-type",
+          "data": {
+            "arch": "armv7hf"
+          }
+        },
+        {
+          "type": "hw.device-type",
+          "data": {
+            "arch": "rpi"
+          }
+        }
       ]
     }
-  ],
-  "variants": ""
+  ]
 }
diff --git a/contracts/arch.sw/armv7hf/contract.json b/contracts/arch.sw/armv7hf/contract.json
index 416f20da..9f907917 100644
--- a/contracts/arch.sw/armv7hf/contract.json
+++ b/contracts/arch.sw/armv7hf/contract.json
@@ -3,13 +3,13 @@
   "version": "1",
   "type": "arch.sw",
   "name": "ARM v7",
-  "arch": "armv7hf",
+  "data": { "arch": "armv7hf" },
   "requires": [
     {
-      "or": [
-        { "type": "hw.device-type", "arch": "armv7hf" }
-      ]
+      "type": "hw.device-type",
+      "data": {
+        "arch": "armv7hf"
+      }
     }
-  ],
-  "variants": ""
+  ]
 }
diff --git a/contracts/arch.sw/rpi/contract.json b/contracts/arch.sw/rpi/contract.json
index 67695ef5..023c5c1c 100644
--- a/contracts/arch.sw/rpi/contract.json
+++ b/contracts/arch.sw/rpi/contract.json
@@ -3,13 +3,13 @@
   "version": "1",
   "type": "arch.sw",
   "name": "ARM v6",
-  "arch": "armv6hf",
+  "data": { "arch": "armv6hf" },
   "requires": [
     {
-      "or": [
-        { "type": "hw.device-type", "arch": "rpi" }
-      ]
+      "type": "hw.device-type",
+      "data": {
+        "arch": "rpi"
+      }
     }
-  ],
-  "variants": ""
+  ]
 }
diff --git a/contracts/hw.device-type/vab820-quad/boot-external.tpl b/contracts/hw.device-type/via-vab820-quad/boot-external.tpl
similarity index 100%
rename from contracts/hw.device-type/vab820-quad/boot-external.tpl
rename to contracts/hw.device-type/via-vab820-quad/boot-external.tpl
diff --git a/contracts/hw.device-type/vab820-quad/boot-internal.tpl b/contracts/hw.device-type/via-vab820-quad/boot-internal.tpl
similarity index 100%
rename from contracts/hw.device-type/vab820-quad/boot-internal.tpl
rename to contracts/hw.device-type/via-vab820-quad/boot-internal.tpl
diff --git a/contracts/hw.device-type/vab820-quad/prepare-network.tpl b/contracts/hw.device-type/via-vab820-quad/prepare-network.tpl
similarity index 100%
rename from contracts/hw.device-type/vab820-quad/prepare-network.tpl
rename to contracts/hw.device-type/via-vab820-quad/prepare-network.tpl