From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Michael Riesch <michael.riesch@wolfvision.net>
Subject: [PATCH v3 2/3] boards: qemu-virt: compile overlay as such
Date: Mon, 13 Mar 2023 15:42:19 +0100 [thread overview]
Message-ID: <20230313144220.1689252-3-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20230313144220.1689252-1-a.fatoum@pengutronix.de>
From: Ahmad Fatoum <ahmad@a3f.at>
Build system now differentiates between building normal device trees and
overlays; as the latter would be broken when CONFIG_EXTERNAL_DTS_FRAGMENTS
is in use. Switch over Qemu board support to build the overlay as such.
Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
common/boards/qemu-virt/Makefile | 2 +-
common/boards/qemu-virt/board.c | 4 ++--
common/boards/qemu-virt/{overlay-of-flash.dts => flash.dtso} | 0
3 files changed, 3 insertions(+), 3 deletions(-)
rename common/boards/qemu-virt/{overlay-of-flash.dts => flash.dtso} (100%)
diff --git a/common/boards/qemu-virt/Makefile b/common/boards/qemu-virt/Makefile
index 88184e9a7969..53f00d1b0c41 100644
--- a/common/boards/qemu-virt/Makefile
+++ b/common/boards/qemu-virt/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
obj-y += board.o
-obj-y += overlay-of-flash.dtb.o
+obj-y += flash.dtbo.o
ifeq ($(CONFIG_RISCV),y)
DTC_CPP_FLAGS_overlay-of-flash.dtb := -DRISCV_VIRT=1
endif
diff --git a/common/boards/qemu-virt/board.c b/common/boards/qemu-virt/board.c
index 7e0e63333c5c..89d103493179 100644
--- a/common/boards/qemu-virt/board.c
+++ b/common/boards/qemu-virt/board.c
@@ -34,7 +34,7 @@ static inline void arm_virt_init(void)
static inline void arm_virt_init(void) {}
#endif
-extern char __dtb_overlay_of_flash_start[];
+extern char __dtbo_flash_start[];
static const struct of_device_id virt_of_match[] = {
{ .compatible = "linux,dummy-virt", .data = arm_virt_init },
@@ -62,7 +62,7 @@ static int virt_board_driver_init(void)
init();
}
- overlay = of_unflatten_dtb(__dtb_overlay_of_flash_start, INT_MAX);
+ overlay = of_unflatten_dtb(__dtbo_flash_start, INT_MAX);
of_overlay_apply_tree(root, overlay);
/* of_probe() will happen later at of_populate_initcall */
diff --git a/common/boards/qemu-virt/overlay-of-flash.dts b/common/boards/qemu-virt/flash.dtso
similarity index 100%
rename from common/boards/qemu-virt/overlay-of-flash.dts
rename to common/boards/qemu-virt/flash.dtso
--
2.30.2
next prev parent reply other threads:[~2023-03-13 14:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-13 14:42 [PATCH v3 0/3] boards: qemu-virt: support passing in FIT public key Ahmad Fatoum
2023-03-13 14:42 ` [PATCH v3 1/3] boards: qemu-virt: apply overlay at postcore_initcall level Ahmad Fatoum
2023-03-13 14:42 ` Ahmad Fatoum [this message]
2023-03-13 14:42 ` [PATCH v3 3/3] boards: qemu-virt: support passing in FIT public key Ahmad Fatoum
2023-03-13 14:46 ` [PATCH v3 0/3] " Ahmad Fatoum
2023-03-14 8:05 ` Sascha Hauer
2023-04-11 10:00 ` Ahmad Fatoum
2023-04-11 12:35 ` Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230313144220.1689252-3-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=michael.riesch@wolfvision.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox