From: Rouven Czerwinski <r.czerwinski@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Rouven Czerwinski <r.czerwinski@pengutronix.de>
Subject: [RFC Patch 2/3] blspec: take compatible name as argument
Date: Fri, 4 Mar 2022 07:24:12 +0100 [thread overview]
Message-ID: <20220304062412.1248657-3-r.czerwinski@pengutronix.de> (raw)
In-Reply-To: <20220304062412.1248657-1-r.czerwinski@pengutronix.de>
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 0ea857294f..c1b1991338 100644
--- a/common/blspec.c
+++ b/common/blspec.c
@@ -421,7 +421,7 @@ out:
*
* 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;
@@ -429,7 +429,6 @@ static bool entry_is_of_compatible(struct blspec_entry *entry)
void *fdt = NULL;
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 */
@@ -445,10 +444,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
@@ -624,7 +619,7 @@ int blspec_scan_directory(struct bootentries *bootentries, const char *root)
entry = lentry->entry;
- if (!entry_is_of_compatible(entry)) {
+ if (!entry_is_of_compatible(entry, of_get_machine_compatible())) {
blspec_entry_free(&entry->entry);
list_del(&lentry->list);
free(lentry);
--
2.35.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2022-03-04 6:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-04 6:24 [RFC Patch 0/3] BLSpec device-tree fallback handling Rouven Czerwinski
2022-03-04 6:24 ` [RFC Patch 1/3] blspec: create list of entries, iterate over list Rouven Czerwinski
2022-03-04 6:24 ` Rouven Czerwinski [this message]
2022-03-04 6:24 ` [RFC Patch 3/3] blspec: allow setting compatible depth Rouven Czerwinski
2022-03-08 8:11 ` 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=20220304062412.1248657-3-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