mb/emulation: Remove fake devicetree.cb components
Change-Id: I31853e3ede786eb9e10704674e42dd56c3a48688
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/41717
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Philipp Hug <philipp@hug.cx>
diff --git a/src/mainboard/emulation/qemu-aarch64/devicetree.cb b/src/mainboard/emulation/qemu-aarch64/devicetree.cb
index 533e451..d887837 100644
--- a/src/mainboard/emulation/qemu-aarch64/devicetree.cb
+++ b/src/mainboard/emulation/qemu-aarch64/devicetree.cb
@@ -1,6 +1,5 @@
# SPDX-License-Identifier: GPL-2.0-or-later
-# This file exists only to avoid a compile error. It needs a devicetree.cb that is not empty.
-chip drivers/generic/generic # I2C0 controller
- device i2c 6 on end # Fake component for testing
+chip mainboard/emulation/qemu-aarch64
+ device cpu_cluster 0 on end
end
diff --git a/src/mainboard/emulation/qemu-aarch64/mainboard.c b/src/mainboard/emulation/qemu-aarch64/mainboard.c
index eb5c11d..e6da3a6 100644
--- a/src/mainboard/emulation/qemu-aarch64/mainboard.c
+++ b/src/mainboard/emulation/qemu-aarch64/mainboard.c
@@ -27,3 +27,5 @@
.name = "qemu_aarch64",
.enable_dev = mainboard_enable,
};
+
+struct chip_operations mainboard_emulation_qemu_aarch64_ops = { };
diff --git a/src/mainboard/emulation/qemu-armv7/devicetree.cb b/src/mainboard/emulation/qemu-armv7/devicetree.cb
index 18ec632..f9efb48 100644
--- a/src/mainboard/emulation/qemu-armv7/devicetree.cb
+++ b/src/mainboard/emulation/qemu-armv7/devicetree.cb
@@ -2,7 +2,5 @@
# TODO fill with Versatile Express board data in QEMU.
chip cpu/armltd/cortex-a9
- chip drivers/generic/generic # I2C0 controller
- device i2c 6 on end # Fake component for testing
- end
+ device cpu_cluster 0 on end
end
diff --git a/src/mainboard/emulation/qemu-riscv/devicetree.cb b/src/mainboard/emulation/qemu-riscv/devicetree.cb
index 2b0d520..120af99 100644
--- a/src/mainboard/emulation/qemu-riscv/devicetree.cb
+++ b/src/mainboard/emulation/qemu-riscv/devicetree.cb
@@ -2,7 +2,4 @@
chip soc/ucb/riscv
device cpu_cluster 0 on end
- chip drivers/generic/generic # I2C0 controller
- device i2c 6 on end # Fake component for testing
- end
end
diff --git a/src/mainboard/emulation/spike-riscv/devicetree.cb b/src/mainboard/emulation/spike-riscv/devicetree.cb
index 2b0d520..120af99 100644
--- a/src/mainboard/emulation/spike-riscv/devicetree.cb
+++ b/src/mainboard/emulation/spike-riscv/devicetree.cb
@@ -2,7 +2,4 @@
chip soc/ucb/riscv
device cpu_cluster 0 on end
- chip drivers/generic/generic # I2C0 controller
- device i2c 6 on end # Fake component for testing
- end
end