diff options
| author | Tom Rini <trini@konsulko.com> | 2019-10-08 18:45:26 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-10-08 18:45:26 -0400 |
| commit | efea5a34bb5be542630ce7161bd3b9cc26a0bcf3 (patch) | |
| tree | fb747d83d81f9c3400a561782114e4c6ecd61a07 /drivers/serial/sandbox.c | |
| parent | 9d536fe8ae7672bdee091f9100389b6f3e53cfc6 (diff) | |
| parent | cc2d27dcdc3e1c76d09d54015e3992380bd7e0fa (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- Rename existing FSP code to fsp1
- Add fsp2 directory in preparation to support FSP 2.0
- Various x86 platform codes update
- Various bug fixes and updates in dm core, sandbox and spl
Diffstat (limited to 'drivers/serial/sandbox.c')
| -rw-r--r-- | drivers/serial/sandbox.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/serial/sandbox.c b/drivers/serial/sandbox.c index 33102fc872f..2f7bc248871 100644 --- a/drivers/serial/sandbox.c +++ b/drivers/serial/sandbox.c @@ -220,6 +220,8 @@ static int sandbox_serial_ofdata_to_platdata(struct udevice *dev) const char *colour; int i; + if (CONFIG_IS_ENABLED(OF_PLATDATA)) + return 0; plat->colour = -1; colour = fdt_getprop(gd->fdt_blob, dev_of_offset(dev), "sandbox,text-colour", NULL); |