From ac9218844741a0dc0ae16b5141517bbd035ce541 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Mon, 28 Feb 2022 14:17:34 -0700
Subject: [PATCH] Move bgad and vboxd out of initfs

---
 bgad/config.toml  | 13 +++++++++++++
 initfs.toml       | 23 -----------------------
 vboxd/config.toml |  6 ++++++
 3 files changed, 19 insertions(+), 23 deletions(-)
 create mode 100644 bgad/config.toml
 create mode 100644 vboxd/config.toml

diff --git a/bgad/config.toml b/bgad/config.toml
new file mode 100644
index 0000000000..184aacc0d4
--- /dev/null
+++ b/bgad/config.toml
@@ -0,0 +1,13 @@
+[[drivers]]
+name = "QEMU Graphics Array"
+class = 3
+vendor = 4660
+device = 4369
+command = ["bgad", "$NAME", "$BAR0"]
+
+[[drivers]]
+name = "VirtualBox Graphics Array"
+class = 3
+vendor = 33006
+device = 48879
+command = ["bgad", "$NAME", "$BAR0"]
diff --git a/initfs.toml b/initfs.toml
index 6f693e2d3f..be5c786ceb 100644
--- a/initfs.toml
+++ b/initfs.toml
@@ -7,21 +7,6 @@ class = 1
 subclass = 6
 command = ["ahcid", "$NAME", "$BAR5", "$BARSIZE5", "$IRQ"]
 
-# bgad
-[[drivers]]
-name = "QEMU Graphics Array"
-class = 3
-vendor = 4660
-device = 4369
-command = ["bgad", "$NAME", "$BAR0"]
-
-[[drivers]]
-name = "VirtualBox Graphics Array"
-class = 3
-vendor = 33006
-device = 48879
-command = ["bgad", "$NAME", "$BAR0"]
-
 # nvmed
 [[drivers]]
 name = "NVME storage"
@@ -30,14 +15,6 @@ subclass = 8
 command = ["nvmed"]
 use_channel = true
 
-# vboxd
-[[drivers]]
-name = "VirtualBox Guest Device"
-class = 8
-vendor = 33006
-device = 51966
-command = ["vboxd", "$NAME", "$BAR0", "$BAR1", "$IRQ"]
-
 # Disabled until issues are fixed
 # # xhcid
 # [[drivers]]
diff --git a/vboxd/config.toml b/vboxd/config.toml
new file mode 100644
index 0000000000..c97272fb3d
--- /dev/null
+++ b/vboxd/config.toml
@@ -0,0 +1,6 @@
+[[drivers]]
+name = "VirtualBox Guest Device"
+class = 8
+vendor = 33006
+device = 51966
+command = ["vboxd", "$NAME", "$BAR0", "$BAR1", "$IRQ"]