diff options
| author | Tom Rini <trini@konsulko.com> | 2023-10-16 12:15:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-10-16 14:26:12 -0400 |
| commit | 09a946d45ee4505f787df8d623745604f63d9368 (patch) | |
| tree | 671af3cd554fd1b7231201333b05e30ef87bd239 /drivers | |
| parent | e0caea4f9c15d44f871218b3d19e99e3ccd6d1f5 (diff) | |
| parent | d2387c6227715eee8fd07466ed4eeffdcc9f86d2 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-marvell
- dns325: Enable 2nd harddrive (Peter & Stefan)
- marvell: cn9310-crb: Misc fixes to SPI / pincntrl in DTS (Chris)
- kirkwood: Add support for ZyXEL NSA325 board (Tony)
- sata_mv: Add bootstd hook to enable sata_bootdev (Tony)
- x240/AC5/AC5X: Disable SMBIOS (Chris)
- Revert "arm: mvebu: x240: Use i2c-gpio instead of built in controller"
(Chris)
- DS116/N2350: Enable bootstd (Tony)
- clearfog: Support multiple DDR sizes (Josua)
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ata/sata_mv.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 1abea0b3093..94d7369351a 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c @@ -34,6 +34,7 @@ #include <common.h> #include <ahci.h> #include <blk.h> +#include <bootdev.h> #include <cpu_func.h> #include <dm.h> #include <log.h> @@ -1105,6 +1106,12 @@ static int sata_mv_probe(struct udevice *dev) /* TODO: undo create */ continue; + ret = bootdev_setup_for_sibling_blk(blk, "sata_bootdev"); + if (ret) { + printf("%s: Failed to create bootdev\n", __func__); + continue; + } + /* If we got here, the current SATA port was probed * successfully, so set the probe status to successful. */ @@ -1117,7 +1124,6 @@ static int sata_mv_probe(struct udevice *dev) static int sata_mv_scan(struct udevice *dev) { /* Nothing to do here */ - return 0; } |