diff options
| author | Tom Rini <[email protected]> | 2024-09-18 13:07:19 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-09-18 13:07:19 -0600 |
| commit | c17805e19b9335e1fb5295c81b59eddf88d1b9ec (patch) | |
| tree | 0e4cbc44f392b9f2e53d1e38e107ec630c0267c9 /drivers | |
| parent | 650883a568653f37ee4ff43beda56152b594a49c (diff) | |
| parent | 017b441b2e3c879b20bcac496369f1213c4bdbcd (diff) | |
Merge patch series "Fix various bugs"
Simon Glass <[email protected]> says:
This series includes the patches needed to make make the EFI 'boot' test
work. That test has now been split off into a separate series along with
the EFI patches.
This series fixes these problems:
- sandbox memory-mapping conflict with PCI
- the fix for that causes the mbr test to crash as it sets up pointers
instead of addresses for its 'mmc' commands
- the mmc and read commands which cast addresses to pointers
- a tricky bug to do with USB keyboard and stdio
- a few other minor things
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/nvmxip/nvmxip-uclass.c | 10 | ||||
| -rw-r--r-- | drivers/usb/Kconfig | 3 |
2 files changed, 4 insertions, 9 deletions
diff --git a/drivers/mtd/nvmxip/nvmxip-uclass.c b/drivers/mtd/nvmxip/nvmxip-uclass.c index 254f04e0b99..d18bd0e3d6b 100644 --- a/drivers/mtd/nvmxip/nvmxip-uclass.c +++ b/drivers/mtd/nvmxip/nvmxip-uclass.c @@ -47,19 +47,13 @@ int nvmxip_probe(struct udevice *udev) return ret; } - log_info("[%s]: the block device %s ready for use\n", udev->name, bdev_name); + log_debug("[%s]: the block device %s ready for use\n", udev->name, + bdev_name); return 0; } -static int nvmxip_post_bind(struct udevice *udev) -{ - dev_or_flags(udev, DM_FLAG_PROBE_AFTER_BIND); - return 0; -} - UCLASS_DRIVER(nvmxip) = { .name = "nvmxip", .id = UCLASS_NVMXIP, - .post_bind = nvmxip_post_bind, }; diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index a972d87c7ad..311aaa7e67f 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -99,7 +99,8 @@ config USB_STORAGE config USB_KEYBOARD bool "USB Keyboard support" - select DM_KEYBOARD if DM_USB + depends on DM_USB + select DM_KEYBOARD select SYS_STDIO_DEREGISTER ---help--- Say Y here if you want to use a USB keyboard for U-Boot command line |