diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/Kconfig | 8 | ||||
| -rw-r--r-- | common/bootsource.c | 68 | ||||
| -rw-r--r-- | common/filetype.c | 22 | ||||
| -rw-r--r-- | common/oftree.c | 33 | ||||
| -rw-r--r-- | common/resource.c | 2 |
5 files changed, 126 insertions, 7 deletions
diff --git a/common/Kconfig b/common/Kconfig index 794de905ef..4909c82322 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -1103,6 +1103,13 @@ config DEBUG_IMX7D_UART Say Y here if you want barebox low-level debugging support on i.MX7D. +config DEBUG_IMX8MQ_UART + bool "i.MX8MQ Debug UART" + depends on ARCH_IMX8MQ + help + Say Y here if you want barebox low-level debugging support + on i.MX8MQ. + config DEBUG_VF610_UART bool "VF610 Debug UART" depends on ARCH_VF610 @@ -1167,6 +1174,7 @@ config DEBUG_IMX_UART_PORT DEBUG_IMX6Q_UART || \ DEBUG_IMX6SL_UART || \ DEBUG_IMX7D_UART || \ + DEBUG_IMX8MQ_UART || \ DEBUG_VF610_UART default 1 depends on ARCH_IMX 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/filetype.c b/common/filetype.c index 77cf9a1056..c5f2384a6c 100644 --- a/common/filetype.c +++ b/common/filetype.c @@ -66,7 +66,8 @@ static const struct filetype_str filetype_str[] = { [filetype_exe] = { "MS-DOS executable", "exe" }, [filetype_mxs_bootstream] = { "Freescale MXS bootstream", "mxsbs" }, [filetype_socfpga_xload] = { "SoCFPGA prebootloader image", "socfpga-xload" }, - [filetype_kwbimage_v1] = { "MVEBU kwbimage (v1)", "kwb" }, + [filetype_kwbimage_v0] = { "MVEBU kwbimage (v0)", "kwb0" }, + [filetype_kwbimage_v1] = { "MVEBU kwbimage (v1)", "kwb1" }, [filetype_android_sparse] = { "Android sparse image", "sparse" }, [filetype_arm64_linux_image] = { "ARM aarch64 Linux image", "aarch64-linux" }, [filetype_elf] = { "ELF", "elf" }, @@ -304,10 +305,21 @@ enum filetype file_detect_type(const void *_buf, size_t bufsize) if ((buf8[0] == 0x5a || buf8[0] == 0x69 || buf8[0] == 0x78 || buf8[0] == 0x8b || buf8[0] == 0x9c) && buf8[0x1] == 0 && buf8[0x2] == 0 && buf8[0x3] == 0 && - buf8[0x8] == 1 && buf8[0x18] == 0 && buf8[0x1b] == 0 && - buf8[0x1c] == 0 && buf8[0x1d] == 0 && - (buf8[0x1e] == 0 || buf8[0x1e] == 1)) - return filetype_kwbimage_v1; + buf8[0x18] == 0 && buf8[0x1b] == 0 && buf8[0x1c] == 0) { + unsigned char sum = 0; + int i; + + for (i = 0; i <= 0x1e; ++i) + sum += buf8[i]; + + if (sum == buf8[0x1f] && buf8[0x8] == 0) + return filetype_kwbimage_v0; + + if (sum == buf8[0x1f] && + buf8[0x8] == 1 && buf8[0x1d] == 0 && + (buf8[0x1e] == 0 || buf8[0x1e] == 1)) + return filetype_kwbimage_v1; + } if (is_sparse_image(_buf)) return filetype_android_sparse; 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) diff --git a/common/resource.c b/common/resource.c index e4bbe15fd7..abc0814d23 100644 --- a/common/resource.c +++ b/common/resource.c @@ -114,7 +114,7 @@ int release_region(struct resource *res) /* The root resource for the whole memory-mapped io space */ struct resource iomem_resource = { .start = 0, - .end = 0xffffffff, + .end = ~(resource_size_t)0, .name = "iomem", .children = LIST_HEAD_INIT(iomem_resource.children), }; |