From: Oleksij Rempel <o.rempel@pengutronix.de> To: barebox@lists.infradead.org Cc: rcz@pengutronix.de, Oleksij Rempel <o.rempel@pengutronix.de> Subject: [PATCH v2 3/4] of: add generic of_fixup_machine_compatible() Date: Wed, 27 Apr 2022 11:37:51 +0200 [thread overview] Message-ID: <20220427093752.1746932-4-o.rempel@pengutronix.de> (raw) In-Reply-To: <20220427093752.1746932-1-o.rempel@pengutronix.de> Add generic function to extend/fixup machine compatible. Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> --- common/Kconfig | 5 +++++ common/misc.c | 17 +++++++++++++++++ common/oftree.c | 41 +++++++++++++++++++++++++++++++++++++++++ include/common.h | 3 +++ include/of.h | 6 ++++++ 5 files changed, 72 insertions(+) diff --git a/common/Kconfig b/common/Kconfig index d08302a573..9b65b728c0 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1066,6 +1066,11 @@ config MACHINE_ID Note: if no hashable information is available no machine id will be passed to the kernel. +config MACHINE_FIXUP + bool "fix up machine compatible" + help + fixup machine compatible supplied by board code info device tree + config SERIAL_NUMBER_FIXUP bool "fix up board serial number" help diff --git a/common/misc.c b/common/misc.c index 3b3bc05bfd..28c6d9f29d 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,22 @@ const char *barebox_get_serial_number(void) BAREBOX_MAGICVAR(global.serial_number, "Board serial number"); +void barebox_set_of_machine_compatible(const char *__compatible) +{ + globalvar_add_simple_string("of_machine_compatible", + &of_machine_compatible); + + free(of_machine_compatible); + of_machine_compatible = xstrdup(__compatible); +} + +const char *barebox_get_of_machine_compatible(void) +{ + return of_machine_compatible; +} + +BAREBOX_MAGICVAR(global.of_machine_compatible, "Extra OF board compatible"); + void __noreturn panic(const char *fmt, ...) { va_list args; diff --git a/common/oftree.c b/common/oftree.c index c6d75055cc..f17eedc66f 100644 --- a/common/oftree.c +++ b/common/oftree.c @@ -216,6 +216,15 @@ static int of_fixup_bootargs(struct device_node *root, void *unused) } + if (IS_ENABLED(CONFIG_MACHINE_FIXUP)) { + const char *compat; + + compat = getenv("global.of_machine_compatible"); + if (compat) + of_fixup_machine_compatible(root, compat); + + } + node = of_create_node(root, "/chosen"); if (!node) return -ENOMEM; @@ -487,3 +496,35 @@ int of_autoenable_i2c_by_component(char *path) return ret; } + +int of_fixup_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; + } + + curcompat = of_get_property(root, "compatible", &cclen); + + buf = xzalloc(cclen + clen); + + memcpy(buf, compat, clen); + + if (curcompat) + memcpy(buf + clen, curcompat, cclen); + + /* + * Prepend the compatible from board entry to the machine compatible. + * Used to match bootspec entries against it. + */ + 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..9f514c5ec2 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_fixup_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_fixup_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-04-27 9:40 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-04-27 9:37 [PATCH v2 0/4] add different OF board fixups Oleksij Rempel 2022-04-27 9:37 ` [PATCH v2 1/4] common: add $global.serial_number with device tree fixup Oleksij Rempel 2022-04-27 9:37 ` [PATCH v2 2/4] ARM: boards: protonic-imx6: make use of barebox_set_serial_number() Oleksij Rempel 2022-04-27 9:37 ` Oleksij Rempel [this message] 2022-04-27 9:46 ` [PATCH v2 3/4] of: add generic of_fixup_machine_compatible() Ahmad Fatoum 2022-04-27 9:51 ` Oleksij Rempel 2022-04-27 10:00 ` Ahmad Fatoum 2022-04-27 9:37 ` [PATCH v2 4/4] ARM: boards: skov-imx6: make use of of_fixup_machine_compatible() Oleksij Rempel
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=20220427093752.1746932-4-o.rempel@pengutronix.de \ --to=o.rempel@pengutronix.de \ --cc=barebox@lists.infradead.org \ --cc=rcz@pengutronix.de \ --subject='Re: [PATCH v2 3/4] of: add generic of_fixup_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