summaryrefslogtreecommitdiff
path: root/board/emulation
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2024-05-20 13:35:03 -0600
committerTom Rini <[email protected]>2024-05-20 13:35:03 -0600
commit03de305ec48b0bb28554372abb40ccd46dbe0bf9 (patch)
tree57d5eac5f8efb015eb0415824512a29d5e20638e /board/emulation
parentd4781422d1268aa6deca3e49d2fb227e79c160b4 (diff)
Restore patch series "arm: dts: am62-beagleplay: Fix Beagleplay Ethernet"
As part of bringing the master branch back in to next, we need to allow for all of these changes to exist here. Reported-by: Jonas Karlman <[email protected]> Signed-off-by: Tom Rini <[email protected]>
Diffstat (limited to 'board/emulation')
-rw-r--r--board/emulation/common/qemu_dfu.c1
-rw-r--r--board/emulation/common/qemu_mtdparts.c1
-rw-r--r--board/emulation/qemu-arm/qemu-arm.c2
-rw-r--r--board/emulation/qemu-ppce500/qemu-ppce500.c2
-rw-r--r--board/emulation/qemu-riscv/qemu-riscv.c1
5 files changed, 2 insertions, 5 deletions
diff --git a/board/emulation/common/qemu_dfu.c b/board/emulation/common/qemu_dfu.c
index 7e7d84f6c00..393fcaeb742 100644
--- a/board/emulation/common/qemu_dfu.c
+++ b/board/emulation/common/qemu_dfu.c
@@ -3,7 +3,6 @@
* Copyright (c) 2020 Linaro Limited
*/
-#include <common.h>
#include <dfu.h>
#include <env.h>
#include <memalign.h>
diff --git a/board/emulation/common/qemu_mtdparts.c b/board/emulation/common/qemu_mtdparts.c
index 60212e97acf..c1501276789 100644
--- a/board/emulation/common/qemu_mtdparts.c
+++ b/board/emulation/common/qemu_mtdparts.c
@@ -3,7 +3,6 @@
* Copyright (c) 2020 Linaro Limited
*/
-#include <common.h>
#include <dm.h>
#include <mtd.h>
diff --git a/board/emulation/qemu-arm/qemu-arm.c b/board/emulation/qemu-arm/qemu-arm.c
index ecfd19f1a7e..6095cb02b23 100644
--- a/board/emulation/qemu-arm/qemu-arm.c
+++ b/board/emulation/qemu-arm/qemu-arm.c
@@ -3,7 +3,7 @@
* Copyright (c) 2017 Tuomas Tynkkynen
*/
-#include <common.h>
+#include <config.h>
#include <cpu_func.h>
#include <dm.h>
#include <efi.h>
diff --git a/board/emulation/qemu-ppce500/qemu-ppce500.c b/board/emulation/qemu-ppce500/qemu-ppce500.c
index 221361691c1..58e5d5eb942 100644
--- a/board/emulation/qemu-ppce500/qemu-ppce500.c
+++ b/board/emulation/qemu-ppce500/qemu-ppce500.c
@@ -4,7 +4,7 @@
* Copyright (C) 2021, Bin Meng <[email protected]>
*/
-#include <common.h>
+#include <config.h>
#include <command.h>
#include <cpu_func.h>
#include <dm.h>
diff --git a/board/emulation/qemu-riscv/qemu-riscv.c b/board/emulation/qemu-riscv/qemu-riscv.c
index 173245b40e3..e5193e31e37 100644
--- a/board/emulation/qemu-riscv/qemu-riscv.c
+++ b/board/emulation/qemu-riscv/qemu-riscv.c
@@ -3,7 +3,6 @@
* Copyright (C) 2018, Bin Meng <[email protected]>
*/
-#include <common.h>
#include <dm.h>
#include <dm/ofnode.h>
#include <env.h>