From 3ae17a42c1f5d8cbf20b6bc7a4e24505651f1754 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Tue, 26 May 2020 08:27:42 +0300 Subject: mb/emulation: Remove fake devicetree.cb components MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I31853e3ede786eb9e10704674e42dd56c3a48688 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/41717 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Philipp Hug --- src/mainboard/emulation/qemu-aarch64/devicetree.cb | 5 ++--- src/mainboard/emulation/qemu-aarch64/mainboard.c | 2 ++ src/mainboard/emulation/qemu-armv7/devicetree.cb | 4 +--- src/mainboard/emulation/qemu-riscv/devicetree.cb | 3 --- src/mainboard/emulation/spike-riscv/devicetree.cb | 3 --- 5 files changed, 5 insertions(+), 12 deletions(-) (limited to 'src/mainboard/emulation') diff --git a/src/mainboard/emulation/qemu-aarch64/devicetree.cb b/src/mainboard/emulation/qemu-aarch64/devicetree.cb index 533e451cbb..d887837a52 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 eb5c11dcc4..e6da3a6cac 100644 --- a/src/mainboard/emulation/qemu-aarch64/mainboard.c +++ b/src/mainboard/emulation/qemu-aarch64/mainboard.c @@ -27,3 +27,5 @@ struct chip_operations mainboard_ops = { .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 18ec632d22..f9efb48683 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 2b0d520b2b..120af99156 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 2b0d520b2b..120af99156 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 -- cgit v1.2.3