LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sandbox: Drop ad-hoc device declarations in SPL 

Since sandbox's SPL is build with of-platadata, we should not use
U_BOOT_DEVICE() declarations as well. Drop them.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2020-10-03 11:31:23 -06:00
parent 627988f9f9
commit c147329847
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/sandbox/sandbox.c
View File

@ -21,10 +21,12 @@
*/ */
gd_t *gd; gd_t *gd;
#if !CONFIG_IS_ENABLED(OF_PLATDATA)
/* Add a simple GPIO device */ /* Add a simple GPIO device */
U_BOOT_DEVICE(gpio_sandbox) = { U_BOOT_DEVICE(gpio_sandbox) = {
.name = "sandbox_gpio", .name = "sandbox_gpio",
}; };
#endif
void flush_cache(unsigned long start, unsigned long size) void flush_cache(unsigned long start, unsigned long size)
{ {

3
drivers/serial/sandbox.c
View File

@ -267,6 +267,7 @@ U_BOOT_DRIVER(sandbox_serial) = {
.flags = DM_FLAG_PRE_RELOC, .flags = DM_FLAG_PRE_RELOC,
}; };
#if !CONFIG_IS_ENABLED(OF_PLATDATA)
static const struct sandbox_serial_platdata platdata_non_fdt = { static const struct sandbox_serial_platdata platdata_non_fdt = {
.colour = -1, .colour = -1,
}; };
@ -275,4 +276,6 @@ U_BOOT_DEVICE(serial_sandbox_non_fdt) = {
.name = "sandbox_serial", .name = "sandbox_serial",
.platdata = &platdata_non_fdt, .platdata = &platdata_non_fdt,
}; };
#endif
#endif /* CONFIG_IS_ENABLED(OF_CONTROL) */ #endif /* CONFIG_IS_ENABLED(OF_CONTROL) */

2
drivers/sysreset/sysreset_sandbox.c
View File

@ -130,7 +130,9 @@ U_BOOT_DRIVER(warm_sysreset_sandbox) = {
.ops = &sandbox_warm_sysreset_ops, .ops = &sandbox_warm_sysreset_ops,
}; };
#if !CONFIG_IS_ENABLED(OF_PLATDATA)
/* This is here in case we don't have a device tree */ /* This is here in case we don't have a device tree */
U_BOOT_DEVICE(sysreset_sandbox_non_fdt) = { U_BOOT_DEVICE(sysreset_sandbox_non_fdt) = {
.name = "sysreset_sandbox", .name = "sysreset_sandbox",
}; };
#endif