diff options
| author | Tom Rini <trini@konsulko.com> | 2020-10-30 15:24:30 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-10-30 15:24:30 -0400 |
| commit | 63d4607e03e5f1f7ab9a18bc640e31f7d28874b4 (patch) | |
| tree | bdea1f28ad176fcd44f209bf943d25c8bddbe8d2 /drivers/sysreset/sysreset_sandbox.c | |
| 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/sysreset/sysreset_sandbox.c')
| -rw-r--r-- | drivers/sysreset/sysreset_sandbox.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/sysreset/sysreset_sandbox.c b/drivers/sysreset/sysreset_sandbox.c index 69c22a70008..71cabd19568 100644 --- a/drivers/sysreset/sysreset_sandbox.c +++ b/drivers/sysreset/sysreset_sandbox.c @@ -130,7 +130,9 @@ U_BOOT_DRIVER(warm_sysreset_sandbox) = { .ops = &sandbox_warm_sysreset_ops, }; +#if !CONFIG_IS_ENABLED(OF_PLATDATA) /* This is here in case we don't have a device tree */ U_BOOT_DEVICE(sysreset_sandbox_non_fdt) = { .name = "sysreset_sandbox", }; +#endif |