diff options
| author | Tom Rini <trini@konsulko.com> | 2015-10-30 12:56:58 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-10-30 12:56:58 -0400 |
| commit | 588eec2a8603ee8a8e2e913895767c4c02d523af (patch) | |
| tree | 6c51f6e969c5ef309d424b87a0295800baefa87a /common | |
| parent | cde7f96109e4d367df51c8fc522acdcd10f2702e (diff) | |
| parent | 7ee52af455c2cec7b674d2159806f7e95da8e6a5 (diff) | |
| download | blackbird-obmc-uboot-588eec2a8603ee8a8e2e913895767c4c02d523af.tar.gz blackbird-obmc-uboot-588eec2a8603ee8a8e2e913895767c4c02d523af.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-fsl-qoriq
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 2 | ||||
| -rw-r--r-- | common/fdt_support.c | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/common/board_f.c b/common/board_f.c index 486e828fe8..7632041b73 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -806,7 +806,7 @@ static init_fnc_t init_sequence_f[] = { #if defined(CONFIG_BOARD_POSTCLK_INIT) board_postclk_init, #endif -#ifdef CONFIG_FSL_CLK +#ifdef CONFIG_SYS_FSL_CLK get_clocks, #endif #ifdef CONFIG_M68K diff --git a/common/fdt_support.c b/common/fdt_support.c index f86365e8f0..a7ff2dfb81 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -158,25 +158,30 @@ static int fdt_fixup_stdout(void *fdt, int chosenoff) aliasoff = fdt_path_offset(fdt, "/aliases"); if (aliasoff < 0) { err = aliasoff; - goto error; + goto noalias; } path = fdt_getprop(fdt, aliasoff, sername, &len); if (!path) { err = len; - goto error; + goto noalias; } /* fdt_setprop may break "path" so we copy it to tmp buffer */ memcpy(tmp, path, len); err = fdt_setprop(fdt, chosenoff, "linux,stdout-path", tmp, len); -error: if (err < 0) printf("WARNING: could not set linux,stdout-path %s.\n", fdt_strerror(err)); return err; + +noalias: + printf("WARNING: %s: could not read %s alias: %s\n", + __func__, sername, fdt_strerror(err)); + + return 0; } #else static int fdt_fixup_stdout(void *fdt, int chosenoff) |
