Patrick Georgi submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Aaron Durbin: Looks good to me, approved
mb/google/zork: Split devicetree between baseboards

Split zork baseboard devicetree between dalboz and trembyle.
The devicetree is simply duplicated, no other changes in this commit.

BUG=b:158096224
TEST=Build coreboot for zork

Signed-off-by: Rob Barnes <robbarnes@google.com>
Change-Id: I5b26770790092c69db9567fa4337edd21a6ed809
Reviewed-on: https://review.coreboot.org/c/coreboot/+/42741
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
---
M src/mainboard/google/zork/Kconfig
C src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb
R src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb
3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mainboard/google/zork/Kconfig b/src/mainboard/google/zork/Kconfig
index 891f2b8..9740d63 100644
--- a/src/mainboard/google/zork/Kconfig
+++ b/src/mainboard/google/zork/Kconfig
@@ -81,7 +81,8 @@

config DEVICETREE
string
- default "variants/baseboard/devicetree.cb"
+ default "variants/baseboard/devicetree_trembyle.cb" if BOARD_GOOGLE_BASEBOARD_TREMBYLE
+ default "variants/baseboard/devicetree_dalboz.cb" if BOARD_GOOGLE_BASEBOARD_DALBOZ

config OVERRIDE_DEVICETREE
string
diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb
similarity index 100%
copy from src/mainboard/google/zork/variants/baseboard/devicetree.cb
copy to src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb
diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb
similarity index 100%
rename from src/mainboard/google/zork/variants/baseboard/devicetree.cb
rename to src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb

To view, visit change 42741. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I5b26770790092c69db9567fa4337edd21a6ed809
Gerrit-Change-Number: 42741
Gerrit-PatchSet: 5
Gerrit-Owner: Rob Barnes <robbarnes@google.com>
Gerrit-Reviewer: Aaron Durbin <adurbin@chromium.org>
Gerrit-Reviewer: Furquan Shaikh <furquan@google.com>
Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com>
Gerrit-Reviewer: Raul Rangel <rrangel@chromium.org>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-MessageType: merged