commit 70392691fea334bae8ed895719e243f67e69df80
author Bobby R. Bruce <bbruce@ucdavis.edu> Thu Aug 25 11:40:46 2022 -0700
committer Bobby Bruce <bbruce@ucdavis.edu> Thu Aug 25 18:45:10 2022 +0000
tree e058c6b74acb4a872cb501c481c5e9a4b976ef9a
parent 91dc01b9113bab1116a94029a4d8aab4f883b673

resources: Revert "workload" additions

This reverts commits:
91dc01b9113bab1116a94029a4d8aab4f883b673.
7822b85486b5557f566743e4fbf0427e7f884b2f.
cecfbba7a60eeb0ee3b9b4f4c455ae186cf971d4.

This can only be merged into develop after this commit is merged:
https://gem5-review.googlesource.com/c/public/gem5/+/62532

At the time of writing it is now and was causing test errors:
https://jenkins.gem5.org/job/nightly/331

Change-Id: Ibb6ea418d3872105e31a4a20670eb4820f062efb
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5-resources/+/62672
Maintainer: Bobby Bruce <bbruce@ucdavis.edu>
Tested-by: Bobby Bruce <bbruce@ucdavis.edu>
Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu>

resources.json

diff --git a/resources.json b/resources.json
index b3c523f..c51d0e7 100644
--- a/resources.json
+++ b/resources.json
@@ -8,40 +8,6 @@
     },
     "resources": [
         {
-            "type" : "workload",
-            "name" : "x86-ubuntu-18.04-boot",
-            "documentation" : "A full boot of Ubuntu 18.04 with Linux 5.4.49 for X86. It runs an `m5 exit` command when the boot is completed unless the readfile is specified. If specified the readfile will be executed after booting.",
-            "function": "set_kernel_disk_workload",
-            "resources" : {
-                "kernel" : "x86-linux-kernel-5.4.49",
-                "disk_image":"x86-ubuntu-18.04-img"
-            },
-            "additional_params" : {}
-        },
-        {
-            "type" : "workload",
-            "name" : "riscv-ubuntu-20.04-boot",
-            "documentation" : "A full boot of Ubuntu 20.04 with Linux 5.10 for RISCV. It runs an `m5 exit` command when the boot is completed unless the readfile is specified. If specified the readfile will be executed after booting.",
-            "function": "set_kernel_disk_workload",
-            "resources" : {
-                "kernel" : "riscv-bootloader-vmlinux-5.10",
-                "disk_image":"riscv-ubuntu-20.04-img"
-            },
-            "additional_params" : {}
-        },
-        {
-            "type" : "workload",
-            "name" : "arm64-ubuntu-20.04-boot",
-            "documentation" : "A full boot of Ubuntu 20.04 with Linux 5.4.49 for ARM64. It runs an `m5 exit` command when the boot is completed unless the readfile is specified. If specified the readfile will be executed after booting.",
-            "function": "set_kernel_disk_workload",
-            "resources" : {
-                "kernel" : "arm64-linux-kernel-5.4.49",
-                "disk_image": "arm64-ubuntu-20.04-img",
-                "bootloader": "arm64-bootloader-foundation"
-            },
-            "additional_params" : {}
-        },
-        {
             "type": "resource",
             "name" : "vega-mmio",
             "documentation" : "Used with the 'x86-gpu-fs-img' disk image.",