current_pci_flags = na > 2 ? of_read_number(addr, 1) : 0;
child_pci_flags = cna > 2 ? of_read_number(ranges, 1) : 0;
if (current_pci_flags != 0 && current_pci_flags != child_pci_flags) {
- fprintf(stderr, "Unexpected change in flags: %lx, %lx\n",
+ fprintf(stderr, "Unexpected change in flags: %" PRIu64 ", %" PRIu64 "\n",
current_pci_flags, child_pci_flags);
return -1;
}
fprintf(stderr, "New address:\n\t");
for (i = 0; i < *addr_cells; i++)
- fprintf(stderr, " %lx ", of_read_number(&addr[i], 1));
+ fprintf(stderr, " %" PRIu64 " ", of_read_number(&addr[i], 1));
fprintf(stderr, "\n");
return 0;
fprintf(stderr, "Final address:\n\t");
for (i = 0; i < addr_cells; i++)
- fprintf(stderr, " %lx ", of_read_number(&addr[i], 1));
+ fprintf(stderr, " %" PRIu64 " ", of_read_number(&addr[i], 1));
fprintf(stderr, "\n");
if (addr_cells + size_cells > reg_cells) {
{
const char *boot_console, *ptr;
long unsigned int termno;
- const fdt32_t *prop;
- int node, prop_len;
char *stdout_path;
+ int node;
boot_console = getenv("boot_console");
if (!boot_console) {
if (strncmp(boot_console, "/dev/", strlen("/dev/")) != 0) {
/* We already have the full path */
stdout_path = talloc_strdup(ctx, boot_console);
- } else if (strstr(boot_console, "tty") != NULL) {
+ /* Check for a tty* console but don't accidentally catch
+ * ttyS* consoles */
+ } else if (strstr(boot_console, "tty") != NULL &&
+ strstr(boot_console, "ttyS") == NULL) {
fprintf(stderr, "TTY recognised: %s\n", boot_console);
stdout_path = get_vga_path(ctx);
} else {
return -1;
}
- prop = fdt_getprop(ctx->dtb, node, "linux,stdout-path", &prop_len);
- if (!prop) {
- fprintf(stderr, "Failed to find linux,stdout-path\n");
- return -1;
- }
-
+ /*
+ * linux,stdout-path is deprecated after v3.14 but we don't know
+ * what the next kernel will be, so set both.
+ */
+ fdt_set_check(ctx->dtb, node, fdt_setprop_string, "stdout-path",
+ stdout_path);
fdt_set_check(ctx->dtb, node, fdt_setprop_string, "linux,stdout-path",
stdout_path);