diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-06-11 22:36:28 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-06-11 22:36:28 +0200 |
commit | 8e336580a1e1f8786162bcfa56c2c9dcc99b8f4f (patch) | |
tree | f2e314d9a235d4b3780f89cb2f88c7e4d2e7795d /common | |
parent | 8985573ad66c9fb011910a352b8c1427ee08ded3 (diff) | |
parent | 58243d98b3f8e000c674a78a9466bd2fce213cc6 (diff) | |
download | barebox-8e336580a1e1f8786162bcfa56c2c9dcc99b8f4f.tar.gz barebox-8e336580a1e1f8786162bcfa56c2c9dcc99b8f4f.tar.xz |
Merge branch 'for-next/of-bootsource'
Diffstat (limited to 'common')
-rw-r--r-- | common/bootsource.c | 68 | ||||
-rw-r--r-- | common/oftree.c | 33 |
2 files changed, 100 insertions, 1 deletions
diff --git a/common/bootsource.c b/common/bootsource.c index 78ecd82676..e68338faa5 100644 --- a/common/bootsource.c +++ b/common/bootsource.c @@ -41,6 +41,74 @@ static const char *bootsource_str[] = { static enum bootsource bootsource = BOOTSOURCE_UNKNOWN; static int bootsource_instance = BOOTSOURCE_INSTANCE_UNKNOWN; +const char *bootsource_alias_name = NULL; + +/** + * bootsource_get_alias_name() - Get the name of the bootsource alias + * + * This function will return newly allocated string containing name of + * the alias that is expected to point to DTB node corresponding to + * detected bootsource + * + * NOTE: Caller is expected to free() the string allocated by this + * function + */ +char *bootsource_get_alias_name(void) +{ + const char *stem; + + /* + * If alias name was overridden via + * bootsource_set_alias_name() return that value without + * asking any questions. + * + * Note that we have to strdup() the result to make it + * free-able. + */ + if (bootsource_alias_name) + return strdup(bootsource_alias_name); + + switch (bootsource) { + /* + * For I2C and SPI EEPROMs we set the stem to be 'i2c' + * and 'spi' correspondingly. The resulting alias will + * be pointing at the controller said EEPROM is + * attached to. + * + * NOTE: This code assumes single bootable EEPROM per + * controller + */ + case BOOTSOURCE_I2C_EEPROM: + stem = bootsource_str[BOOTSOURCE_I2C]; + break; + case BOOTSOURCE_SPI_EEPROM: + stem = bootsource_str[BOOTSOURCE_SPI]; + break; + case BOOTSOURCE_SERIAL: /* FALLTHROUGH */ + case BOOTSOURCE_I2C: /* FALLTHROUGH */ + case BOOTSOURCE_MMC: /* FALLTHROUGH */ + case BOOTSOURCE_SPI: /* FALLTHROUGH */ + case BOOTSOURCE_CAN: + stem = bootsource_str[bootsource]; + break; + default: + return NULL; + } + + /* + * We expect SoC specific bootsource detction code to properly + * initalize bootsource_instance, so we bail out if it didn't + */ + if (bootsource_instance == BOOTSOURCE_INSTANCE_UNKNOWN) + return NULL; + + return basprintf("%s%d", stem, bootsource_instance); +} + +void bootsource_set_alias_name(const char *name) +{ + bootsource_alias_name = name; +} void bootsource_set(enum bootsource src) { diff --git a/common/oftree.c b/common/oftree.c index 8a2ede4c60..5bb5420a78 100644 --- a/common/oftree.c +++ b/common/oftree.c @@ -11,7 +11,9 @@ #include <getopt.h> #include <init.h> #include <boot.h> +#include <bootsource.h> #include <i2c/i2c.h> +#include <reset_source.h> #define MAX_LEVEL 32 /* how deeply nested we will go */ @@ -114,6 +116,29 @@ void of_print_cmdline(struct device_node *root) printf("commandline: %s\n", cmdline); } +static int of_fixup_bootargs_bootsource(struct device_node *root, + struct device_node *chosen) +{ + char *alias_name = bootsource_get_alias_name(); + struct device_node *bootsource; + int ret = 0; + + if (!alias_name) + return 0; + + bootsource = of_find_node_by_alias(root, alias_name); + /* + * If kernel DTB doesn't have the appropriate alias set up, + * give up and exit early. No error is reported. + */ + if (bootsource) + ret = of_set_property(chosen, "bootsource", bootsource->full_name, + strlen(bootsource->full_name) + 1, true); + + free(alias_name); + return ret; +} + static int of_fixup_bootargs(struct device_node *root, void *unused) { struct device_node *node; @@ -131,8 +156,14 @@ static int of_fixup_bootargs(struct device_node *root, void *unused) of_property_write_string(node, "barebox-version", release_string); err = of_property_write_string(node, "bootargs", str); + if (err) + return err; + + of_property_write_string(node, "reset-source", reset_source_name()); + of_property_write_u32(node, "reset-source-instance", + reset_source_get_instance()); - return err; + return of_fixup_bootargs_bootsource(root, node); } static int of_register_bootargs_fixup(void) |