From: Oleksij Rempel <o.rempel@pengutronix.de> To: barebox@lists.infradead.org Cc: Oleksij Rempel <o.rempel@pengutronix.de> Subject: [PATCH v6 3/5] of: add generic of_prepend_machine_compatible() Date: Tue, 3 May 2022 11:12:18 +0200 [thread overview] Message-ID: <20220503091220.3871612-4-o.rempel@pengutronix.de> (raw) In-Reply-To: <20220503091220.3871612-1-o.rempel@pengutronix.de> Add generic function to extend/fixup machine compatible. Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> --- common/misc.c | 23 +++++++++++++++++++++++ common/oftree.c | 36 ++++++++++++++++++++++++++++++++++++ include/common.h | 3 +++ include/of.h | 6 ++++++ 4 files changed, 68 insertions(+) diff --git a/common/misc.c b/common/misc.c index 3b3bc05bfd..0f6de3e9e5 100644 --- a/common/misc.c +++ b/common/misc.c @@ -150,6 +150,7 @@ BAREBOX_MAGICVAR(global.model, "Product name of this hardware"); static char *hostname; static char *serial_number; +static char *of_machine_compatible; /* * The hostname is supposed to be the shortname of a board. It should @@ -195,6 +196,28 @@ const char *barebox_get_serial_number(void) BAREBOX_MAGICVAR(global.serial_number, "Board serial number"); +void barebox_set_of_machine_compatible(const char *__compatible) +{ + free(of_machine_compatible); + of_machine_compatible = xstrdup(__compatible); +} + +const char *barebox_get_of_machine_compatible(void) +{ + return of_machine_compatible; +} + +static int of_kernel_init(void) +{ + globalvar_add_simple_string("of.kernel.add_machine_compatible", + &of_machine_compatible); + + return 0; +} +device_initcall(of_kernel_init); + +BAREBOX_MAGICVAR(global.of.kernel.add_machine_compatible, "Additional machine/board compatible"); + void __noreturn panic(const char *fmt, ...) { va_list args; diff --git a/common/oftree.c b/common/oftree.c index 51f825c3f3..91b3fcc9fa 100644 --- a/common/oftree.c +++ b/common/oftree.c @@ -207,11 +207,16 @@ static int of_fixup_bootargs(struct device_node *root, void *unused) int instance = reset_source_get_instance(); struct device_d *dev; const char *serialno; + const char *compat; serialno = barebox_get_serial_number(); if (serialno) of_property_write_string(root, "serial-number", serialno); + compat = barebox_get_of_machine_compatible(); + if (compat) + of_prepend_machine_compatible(root, compat); + node = of_create_node(root, "/chosen"); if (!node) return -ENOMEM; @@ -483,3 +488,34 @@ int of_autoenable_i2c_by_component(char *path) return ret; } + +int of_prepend_machine_compatible(struct device_node *root, const char *compat) +{ + int cclen = 0, clen = strlen(compat) + 1; + const char *curcompat; + void *buf; + + if (!root) { + root = of_get_root_node(); + if (!root) + return -ENODEV; + } + + if (of_device_is_compatible(root, compat)) + return 0; + + curcompat = of_get_property(root, "compatible", &cclen); + + buf = xzalloc(cclen + clen); + + memcpy(buf, compat, clen); + + if (curcompat) + memcpy(buf + clen, curcompat, cclen); + + of_set_property(root, "compatible", buf, cclen + clen, true); + + free(buf); + + return 0; +} diff --git a/include/common.h b/include/common.h index 967502a7ab..bd12035688 100644 --- a/include/common.h +++ b/include/common.h @@ -129,4 +129,7 @@ void barebox_set_hostname_no_overwrite(const char *); const char *barebox_get_serial_number(void); void barebox_set_serial_number(const char *); +void barebox_set_of_machine_compatible(const char *); +const char *barebox_get_of_machine_compatible(void); + #endif /* __COMMON_H_ */ diff --git a/include/of.h b/include/of.h index cf9950e9b3..3a8e32f69c 100644 --- a/include/of.h +++ b/include/of.h @@ -316,6 +316,7 @@ struct device_node *of_find_node_by_path_or_alias(struct device_node *root, const char *str); int of_autoenable_device_by_path(char *path); int of_autoenable_i2c_by_component(char *path); +int of_prepend_machine_compatible(struct device_node *root, const char *compat); #else static inline bool of_node_name_eq(const struct device_node *np, const char *name) { @@ -834,6 +835,11 @@ static inline int of_autoenable_i2c_by_component(char *path) return -ENODEV; } +static int of_prepend_machine_compatible(struct device_node *root, + const char *compat) +{ + return -ENODEV; +} #endif -- 2.30.2 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2022-05-03 9:13 UTC|newest] Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-05-03 9:12 [PATCH v6 0/5] add different OF board fixups Oleksij Rempel 2022-05-03 9:12 ` [PATCH v6 1/5] common: add $global.serial_number with device tree fixup Oleksij Rempel 2022-05-03 9:12 ` [PATCH v6 2/5] ARM: boards: protonic-imx6: make use of barebox_set_serial_number() Oleksij Rempel 2022-05-03 9:12 ` Oleksij Rempel [this message] 2022-05-03 9:12 ` [PATCH v6 4/5] ARM: boards: skov-imx6: make use of of_prepend_machine_compatible() Oleksij Rempel 2022-05-03 9:12 ` [PATCH v6 5/5] ARM: boards: protonic-imx6: add HW revision specific machine compatible Oleksij Rempel 2022-05-05 7:15 ` [PATCH v6 0/5] add different OF board fixups 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=20220503091220.3871612-4-o.rempel@pengutronix.de \ --to=o.rempel@pengutronix.de \ --cc=barebox@lists.infradead.org \ --subject='Re: [PATCH v6 3/5] of: add generic of_prepend_machine_compatible()' \ /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
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox