diff options
| author | Tom Rini <[email protected]> | 2021-02-19 21:06:16 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-02-19 21:06:16 -0500 |
| commit | ea966d24ef3a9f7f32712a518a07374f9ae43905 (patch) | |
| tree | 3c53ffa01c21b95dde2013a8ea04e93f496486d3 /common | |
| parent | a1a652e8016426e2d67148cab225cd5ec45189fb (diff) | |
| parent | e036a1d227112565cdf32b5558ac6ccaf5d1633f (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi
- H616 clock fix to enable video PLL
- sunxi-common.h cleanups
- support for UART1 as the console on sun8i
- removing wrong linux,stdout-path from DTs
Diffstat (limited to 'common')
| -rw-r--r-- | common/fdt_support.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/common/fdt_support.c b/common/fdt_support.c index 1a1b4086071..08d540bfc85 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -127,14 +127,7 @@ int fdt_find_or_add_subnode(void *fdt, int parentoffset, const char *name) return offset; } -/* rename to CONFIG_OF_STDOUT_PATH ? */ -#if defined(OF_STDOUT_PATH) -static int fdt_fixup_stdout(void *fdt, int chosenoff) -{ - return fdt_setprop(fdt, chosenoff, "linux,stdout-path", - OF_STDOUT_PATH, strlen(OF_STDOUT_PATH) + 1); -} -#elif defined(CONFIG_OF_STDOUT_VIA_ALIAS) && defined(CONFIG_CONS_INDEX) +#if defined(CONFIG_OF_STDOUT_VIA_ALIAS) && defined(CONFIG_CONS_INDEX) static int fdt_fixup_stdout(void *fdt, int chosenoff) { int err; |