diff options
| author | Tom Rini <trini@konsulko.com> | 2018-11-16 08:37:50 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-11-16 08:37:50 -0500 |
| commit | 1d6edcbfed2af33c748f2beb399810a0441888da (patch) | |
| tree | fe88d63e5ef1dbe1915f90e02429e8b6934859da /drivers/serial/serial_pl01x.c | |
| parent | f6206f8587fc7ec82a57dbbeb5de0f94b3c2ef49 (diff) | |
| parent | 4c6e27f63c88d065a98f438085dfc36af47d3a23 (diff) | |
Merge tag 'pull-14nov18' of git://git.denx.de/u-boot-dm
- virtio implementation and supporting patches
- DM_FLAG_PRE_RELOC fixes
- regmap improvements
- minor buildman and sandbox things
Diffstat (limited to 'drivers/serial/serial_pl01x.c')
| -rw-r--r-- | drivers/serial/serial_pl01x.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c index 2a5f256184..12512f6578 100644 --- a/drivers/serial/serial_pl01x.c +++ b/drivers/serial/serial_pl01x.c @@ -363,7 +363,9 @@ U_BOOT_DRIVER(serial_pl01x) = { .platdata_auto_alloc_size = sizeof(struct pl01x_serial_platdata), .probe = pl01x_serial_probe, .ops = &pl01x_serial_ops, +#if !CONFIG_IS_ENABLED(OF_CONTROL) .flags = DM_FLAG_PRE_RELOC, +#endif .priv_auto_alloc_size = sizeof(struct pl01x_priv), }; |