diff options
| author | Tom Rini <trini@konsulko.com> | 2020-06-03 11:44:12 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-06-03 11:44:12 -0400 |
| commit | 49c8c91cc69546f7a2017bc0943ef1225a01c72c (patch) | |
| tree | f91b7127c7f7c9798f511e786d0b6a3116d79f53 /drivers | |
| parent | ecd4d99f654f3f7bfb96001891d69c3125e70b69 (diff) | |
| parent | 9f8aa0fbee40b66ceeaab06d3a0ce9a7a7d692a7 (diff) | |
Merge branch '2020-06-03-misc-bugfixes'
- Update various docs to not have 'ARCH=' in them as that's not part of
how U-Boot builds.
- Add macOS tools-only build to Azure to help catch problems on BSD
hosts with tools.
- Bugfixes from the latest header cleanup around ARCH_DMA_MINALIGN
- Assorted small Kconfig logic/typo corrections
- Add a default hash to FIT images that have their its auto generated.
- Other assorted fixes
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/bootcount/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/input/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/usb/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/usb/host/ohci.h | 1 |
4 files changed, 7 insertions, 4 deletions
diff --git a/drivers/bootcount/Kconfig b/drivers/bootcount/Kconfig index 0356f8ba181..c8e6fa7f892 100644 --- a/drivers/bootcount/Kconfig +++ b/drivers/bootcount/Kconfig @@ -27,6 +27,8 @@ config BOOTCOUNT_GENERIC config BOOTCOUNT_EXT bool "Boot counter on EXT filesystem" + depends on FS_EXT4 + select EXT4_WRITE help Add support for maintaining boot count in a file on an EXT filesystem. diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig index a3bdd9fa346..a17e55e9972 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig @@ -21,7 +21,7 @@ config DM_KEYBOARD input and update LEDs if the keyboard has them. config SPL_DM_KEYBOARD - bool "Enable driver model keyboard support" + bool "Enable driver model keyboard support for SPL" depends on SPL_DM help This adds a uclass for keyboards and implements keyboard support @@ -30,7 +30,7 @@ config SPL_DM_KEYBOARD input and update LEDs if the keyboard has them. config TPL_DM_KEYBOARD - bool "Enable driver model keyboard support" + bool "Enable driver model keyboard support for TPL" depends on TPL_DM help This adds a uclass for keyboards and implements keyboard support diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 928a89133cf..756a4ec402e 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig @@ -39,8 +39,8 @@ config DM_USB help Enable driver model for USB. The USB interface is then implemented by the USB uclass. Multiple USB controllers of different types - (XHCI, EHCI) can be attached and used. The 'usb' command works as - normal. OCHI is not supported at present. + (XHCI, EHCI, OHCI) can be attached and used. The 'usb' command works + as normal. Much of the code is shared but with this option enabled the USB uclass takes care of device enumeration. USB devices can be diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h index 9b264bd92ab..a38cd25eb85 100644 --- a/drivers/usb/host/ohci.h +++ b/drivers/usb/host/ohci.h @@ -11,6 +11,7 @@ * e.g. PCI controllers need this */ +#include <asm/cache.h> #include <asm/io.h> #ifdef CONFIG_SYS_OHCI_SWAP_REG_ACCESS |