diff options
| author | Tom Rini <[email protected]> | 2020-10-30 15:24:30 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-10-30 15:24:30 -0400 |
| commit | 63d4607e03e5f1f7ab9a18bc640e31f7d28874b4 (patch) | |
| tree | bdea1f28ad176fcd44f209bf943d25c8bddbe8d2 /drivers/serial | |
| parent | 096912b5fe9bb2fd90599d86a714001df6924198 (diff) | |
| parent | 2424057b2ad0eacdd2d81e35e7bea5df97802b8f (diff) | |
Merge tag 'dm-pull-30oct20' of https://gitlab.denx.de/u-boot/custodians/u-boot-dm
of-platdata and dtoc improvements
sandbox SPL tests
binman support for compressed sections
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/sandbox.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c index f09d291e043..db2fbac6295 100644 --- a/drivers/serial/sandbox.c +++ b/drivers/serial/sandbox.c @@ -267,6 +267,7 @@ U_BOOT_DRIVER(sandbox_serial) = { .flags = DM_FLAG_PRE_RELOC, }; +#if !CONFIG_IS_ENABLED(OF_PLATDATA) static const struct sandbox_serial_platdata platdata_non_fdt = { .colour = -1, }; @@ -275,4 +276,6 @@ U_BOOT_DEVICE(serial_sandbox_non_fdt) = { .name = "sandbox_serial", .platdata = &platdata_non_fdt, }; +#endif + #endif /* CONFIG_IS_ENABLED(OF_CONTROL) */ |