diff options
| author | Tom Rini | 2024-04-14 12:26:42 -0600 |
|---|---|---|
| committer | Tom Rini | 2024-04-14 15:55:14 -0600 |
| commit | 57cb92de7a9d01be1ce72af003651efc80ac67e2 (patch) | |
| tree | eae708f156dfe7002c03cfbd4c87bacf188a8d90 /cmd/sf.c | |
| parent | 266603d8c39cf4d194e2cfe8d86d870590e150e0 (diff) | |
| parent | 248fc16055858c2028a381bb59e12354c4ae19ea (diff) | |
Merge tag 'u-boot-nand-20240414' of https://source.denx.de/u-boot/custodians/u-boot-nand-flash
The first patch is by Weizhao Ouyang and avoids sf probe crashes.
The second patch is by Arseniy Krasnov and adds basic support for Amlogic
Meson NAND controller on AXG.
The following four patches are by Alexander Dahl and apply some fixes to
drivers/mtd/nand/raw/ and port some changes applied in Linux.
The following patch is by Bruce Suen and adds support for XTX SPINAND.
Finally, the last patch is again by Arseniy Krasnov and adds access to
OTP region, supporting info, dump, write and lock operations.
Diffstat (limited to 'cmd/sf.c')
| -rw-r--r-- | cmd/sf.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -135,8 +135,9 @@ static int do_spi_flash_probe(int argc, char *const argv[]) } flash = NULL; if (use_dt) { - spi_flash_probe_bus_cs(bus, cs, &new); - flash = dev_get_uclass_priv(new); + ret = spi_flash_probe_bus_cs(bus, cs, &new); + if (!ret) + flash = dev_get_uclass_priv(new); } else { flash = spi_flash_probe(bus, cs, speed, mode); } |