From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Subject: [PATCH 1/3] blspec: take compatible name as argument
Date: Wed, 20 Sep 2023 14:37:18 +0200 [thread overview]
Message-ID: <20230920123720.767063-1-r.czerwinski@pengutronix.de> (raw)
Instead of retrieving the root compatible itself, let
entry_is_of_compatible take the compatible as an argument. Pass in
of_get_machine_compatible for now, no functional changes.
Signed-off-by: Rouven Czerwinski <r.czerwinski@pengutronix.de>
---
common/blspec.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/common/blspec.c b/common/blspec.c
index b70332a54c..f8d47f20d2 100644
--- a/common/blspec.c
+++ b/common/blspec.c
@@ -422,13 +422,12 @@ static char *parse_nfs_url(const char *url)
*
* returns true if the entry is compatible, false otherwise
*/
-static bool entry_is_of_compatible(struct blspec_entry *entry)
+static bool entry_is_of_compatible(struct blspec_entry *entry, const char* compat)
{
const char *devicetree;
const char *abspath;
int ret;
struct device_node *root = NULL, *barebox_root;
- const char *compat;
char *filename;
/* If the entry doesn't specify a devicetree we are compatible */
@@ -444,10 +443,6 @@ static bool entry_is_of_compatible(struct blspec_entry *entry)
if (!barebox_root)
return true;
- ret = of_property_read_string(barebox_root, "compatible", &compat);
- if (ret)
- return false;
-
if (entry->rootpath)
abspath = entry->rootpath;
else
@@ -521,7 +516,7 @@ int blspec_scan_file(struct bootentries *bootentries, const char *root,
entry->configpath = xstrdup(configname);
entry->cdev = get_cdev_by_mountpath(root);
- if (!entry_is_of_compatible(entry)) {
+ if (!entry_is_of_compatible(entry, of_get_machine_compatible())) {
blspec_entry_free(&entry->entry);
return -ENODEV;
}
--
2.42.0
next reply other threads:[~2023-09-20 12:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-20 12:37 Rouven Czerwinski [this message]
2023-09-20 12:37 ` [PATCH 2/3] blspec: add new blspec.compatible.extra variable Rouven Czerwinski
2023-09-21 12:37 ` Ahmad Fatoum
2023-09-22 5:19 ` Ahmad Fatoum
2023-09-21 12:57 ` Sascha Hauer
2023-09-20 12:37 ` [PATCH 3/3] blspec: take extra entries into account Rouven Czerwinski
2023-09-21 12:33 ` [PATCH 1/3] blspec: take compatible name as argument Ahmad Fatoum
2023-09-21 12:38 ` 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=20230920123720.767063-1-r.czerwinski@pengutronix.de \
--to=r.czerwinski@pengutronix.de \
--cc=barebox@lists.infradead.org \
/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