From f063190889a5fb44693e4fd70c9382aea7b8a4c1 Mon Sep 17 00:00:00 2001
From: Leah Rowe <leah@libreboot.org>
Date: Sat, 19 Nov 2022 05:02:12 +0000
Subject: cros devices: use a common coreboot tree

---
 resources/coreboot/cros/board.cfg          | 3 +++
 resources/coreboot/daisy/board.cfg         | 4 ----
 resources/coreboot/daisy_snow/board.cfg    | 2 +-
 resources/coreboot/daisy_spring/board.cfg  | 2 +-
 resources/coreboot/gru/board.cfg           | 4 ----
 resources/coreboot/gru_bob/board.cfg       | 2 +-
 resources/coreboot/gru_kevin/board.cfg     | 2 +-
 resources/coreboot/nyan/board.cfg          | 4 ----
 resources/coreboot/nyan_big/board.cfg      | 2 +-
 resources/coreboot/nyan_blaze/board.cfg    | 2 +-
 resources/coreboot/peach/board.cfg         | 5 -----
 resources/coreboot/peach_pit/board.cfg     | 2 +-
 resources/coreboot/veyron/board.cfg        | 4 ----
 resources/coreboot/veyron_jerry/board.cfg  | 2 +-
 resources/coreboot/veyron_mickey/board.cfg | 2 +-
 resources/coreboot/veyron_minnie/board.cfg | 2 +-
 resources/coreboot/veyron_speedy/board.cfg | 2 +-
 17 files changed, 14 insertions(+), 32 deletions(-)
 create mode 100644 resources/coreboot/cros/board.cfg
 delete mode 100644 resources/coreboot/daisy/board.cfg
 delete mode 100644 resources/coreboot/gru/board.cfg
 delete mode 100644 resources/coreboot/nyan/board.cfg
 delete mode 100644 resources/coreboot/peach/board.cfg
 delete mode 100644 resources/coreboot/veyron/board.cfg

diff --git a/resources/coreboot/cros/board.cfg b/resources/coreboot/cros/board.cfg
new file mode 100644
index 00000000..b61c2f00
--- /dev/null
+++ b/resources/coreboot/cros/board.cfg
@@ -0,0 +1,3 @@
+cbtree="cros"
+cbrevision="8da4bfe5b573f395057fbfb5a9d99b376e25c2a4" # 4.17
+romtype="normal"
diff --git a/resources/coreboot/daisy/board.cfg b/resources/coreboot/daisy/board.cfg
deleted file mode 100644
index de6cee44..00000000
--- a/resources/coreboot/daisy/board.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-cbtree="daisy"
-cbrevision="8da4bfe5b573f395057fbfb5a9d99b376e25c2a4" # 4.17
-romtype="normal"
-arch="ARMv7"
diff --git a/resources/coreboot/daisy_snow/board.cfg b/resources/coreboot/daisy_snow/board.cfg
index a0fe8637..cf80db75 100644
--- a/resources/coreboot/daisy_snow/board.cfg
+++ b/resources/coreboot/daisy_snow/board.cfg
@@ -1,4 +1,4 @@
-cbtree="daisy"
+cbtree="cros"
 romtype="normal"
 arch="ARMv7"
 payload_uboot="y"
diff --git a/resources/coreboot/daisy_spring/board.cfg b/resources/coreboot/daisy_spring/board.cfg
index a0fe8637..cf80db75 100644
--- a/resources/coreboot/daisy_spring/board.cfg
+++ b/resources/coreboot/daisy_spring/board.cfg
@@ -1,4 +1,4 @@
-cbtree="daisy"
+cbtree="cros"
 romtype="normal"
 arch="ARMv7"
 payload_uboot="y"
diff --git a/resources/coreboot/gru/board.cfg b/resources/coreboot/gru/board.cfg
deleted file mode 100644
index 1ba7e080..00000000
--- a/resources/coreboot/gru/board.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-cbtree="gru"
-cbrevision="8da4bfe5b573f395057fbfb5a9d99b376e25c2a4" # 4.17
-romtype="normal"
-arch="AArch64"
diff --git a/resources/coreboot/gru_bob/board.cfg b/resources/coreboot/gru_bob/board.cfg
index a437fc5f..e69bd570 100644
--- a/resources/coreboot/gru_bob/board.cfg
+++ b/resources/coreboot/gru_bob/board.cfg
@@ -1,4 +1,4 @@
-cbtree="gru"
+cbtree="cros"
 romtype="normal"
 arch="AArch64"
 payload_uboot="y"
diff --git a/resources/coreboot/gru_kevin/board.cfg b/resources/coreboot/gru_kevin/board.cfg
index a437fc5f..e69bd570 100644
--- a/resources/coreboot/gru_kevin/board.cfg
+++ b/resources/coreboot/gru_kevin/board.cfg
@@ -1,4 +1,4 @@
-cbtree="gru"
+cbtree="cros"
 romtype="normal"
 arch="AArch64"
 payload_uboot="y"
diff --git a/resources/coreboot/nyan/board.cfg b/resources/coreboot/nyan/board.cfg
deleted file mode 100644
index 7da154df..00000000
--- a/resources/coreboot/nyan/board.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-cbtree="nyan"
-cbrevision="8da4bfe5b573f395057fbfb5a9d99b376e25c2a4" # 4.17
-romtype="normal"
-arch="ARMv7"
diff --git a/resources/coreboot/nyan_big/board.cfg b/resources/coreboot/nyan_big/board.cfg
index b68504a0..cf80db75 100644
--- a/resources/coreboot/nyan_big/board.cfg
+++ b/resources/coreboot/nyan_big/board.cfg
@@ -1,4 +1,4 @@
-cbtree="nyan"
+cbtree="cros"
 romtype="normal"
 arch="ARMv7"
 payload_uboot="y"
diff --git a/resources/coreboot/nyan_blaze/board.cfg b/resources/coreboot/nyan_blaze/board.cfg
index b68504a0..cf80db75 100644
--- a/resources/coreboot/nyan_blaze/board.cfg
+++ b/resources/coreboot/nyan_blaze/board.cfg
@@ -1,4 +1,4 @@
-cbtree="nyan"
+cbtree="cros"
 romtype="normal"
 arch="ARMv7"
 payload_uboot="y"
diff --git a/resources/coreboot/peach/board.cfg b/resources/coreboot/peach/board.cfg
deleted file mode 100644
index b88003c5..00000000
--- a/resources/coreboot/peach/board.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-cbtree="peach"
-cbrevision="8da4bfe5b573f395057fbfb5a9d99b376e25c2a4" # 4.17
-romtype="normal"
-arch="ARMv7"
-payload_uboot="y"
diff --git a/resources/coreboot/peach_pit/board.cfg b/resources/coreboot/peach_pit/board.cfg
index 03495b1f..cf80db75 100644
--- a/resources/coreboot/peach_pit/board.cfg
+++ b/resources/coreboot/peach_pit/board.cfg
@@ -1,4 +1,4 @@
-cbtree="peach"
+cbtree="cros"
 romtype="normal"
 arch="ARMv7"
 payload_uboot="y"
diff --git a/resources/coreboot/veyron/board.cfg b/resources/coreboot/veyron/board.cfg
deleted file mode 100644
index 59f8600e..00000000
--- a/resources/coreboot/veyron/board.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-cbtree="veyron"
-cbrevision="8da4bfe5b573f395057fbfb5a9d99b376e25c2a4" # 4.17
-romtype="normal"
-arch="ARMv7"
diff --git a/resources/coreboot/veyron_jerry/board.cfg b/resources/coreboot/veyron_jerry/board.cfg
index 9ee305b0..cf80db75 100644
--- a/resources/coreboot/veyron_jerry/board.cfg
+++ b/resources/coreboot/veyron_jerry/board.cfg
@@ -1,4 +1,4 @@
-cbtree="veyron"
+cbtree="cros"
 romtype="normal"
 arch="ARMv7"
 payload_uboot="y"
diff --git a/resources/coreboot/veyron_mickey/board.cfg b/resources/coreboot/veyron_mickey/board.cfg
index 9ee305b0..cf80db75 100644
--- a/resources/coreboot/veyron_mickey/board.cfg
+++ b/resources/coreboot/veyron_mickey/board.cfg
@@ -1,4 +1,4 @@
-cbtree="veyron"
+cbtree="cros"
 romtype="normal"
 arch="ARMv7"
 payload_uboot="y"
diff --git a/resources/coreboot/veyron_minnie/board.cfg b/resources/coreboot/veyron_minnie/board.cfg
index 9ee305b0..cf80db75 100644
--- a/resources/coreboot/veyron_minnie/board.cfg
+++ b/resources/coreboot/veyron_minnie/board.cfg
@@ -1,4 +1,4 @@
-cbtree="veyron"
+cbtree="cros"
 romtype="normal"
 arch="ARMv7"
 payload_uboot="y"
diff --git a/resources/coreboot/veyron_speedy/board.cfg b/resources/coreboot/veyron_speedy/board.cfg
index 9ee305b0..cf80db75 100644
--- a/resources/coreboot/veyron_speedy/board.cfg
+++ b/resources/coreboot/veyron_speedy/board.cfg
@@ -1,4 +1,4 @@
-cbtree="veyron"
+cbtree="cros"
 romtype="normal"
 arch="ARMv7"
 payload_uboot="y"
-- 
cgit v1.2.1