diff options
| author | Sean Anderson | 2022-04-22 16:11:37 -0400 |
|---|---|---|
| committer | Tom Rini | 2022-05-10 09:51:50 -0400 |
| commit | 381277410d72b6081db8412024b9d5496b4bafd1 (patch) | |
| tree | 9a3dfe7faca39ccf7f3b1bd4fb5946c46edb99f8 | |
| parent | f6973cce6af066d28980c9f82c99cb4e10af8a6f (diff) | |
misc: Fix always compiling MISC even for SPL/TPL
We should only build support for misc if the appropriate SPL/TPL symbol
is defined. To ease the transition, make SPL/TPL_MISC default to MISC.
This is necessary because many drivers don't specify their dependencies
properly. These defaults can be removed once all drivers depend on the
appropriate config.
Fixes: aaba703fd0 ("spl: misc: Allow misc drivers in SPL and TPL")
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
[trini: Add VPL_MISC symbol, handle like SPL/TPL_MISC]
Signed-off-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | drivers/misc/Kconfig | 12 | ||||
| -rw-r--r-- | drivers/misc/Makefile | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 9af806a20ae..85ae7f62e91 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -16,6 +16,7 @@ config MISC config SPL_MISC bool "Enable Driver Model for Misc drivers in SPL" depends on SPL_DM + default MISC help Enable driver model for miscellaneous devices. This class is used only for those do not fit other more general classes. A @@ -25,6 +26,17 @@ config SPL_MISC config TPL_MISC bool "Enable Driver Model for Misc drivers in TPL" depends on TPL_DM + default MISC + help + Enable driver model for miscellaneous devices. This class is + used only for those do not fit other more general classes. A + set of generic read, write and ioctl methods may be used to + access the device. + +config VPL_MISC + bool "Enable Driver Model for Misc drivers in VPL" + depends on VPL_DM + default MISC help Enable driver model for miscellaneous devices. This class is used only for those do not fit other more general classes. A diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 6150d01e884..7a6047f64f9 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -3,7 +3,7 @@ # (C) Copyright 2000-2007 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -obj-$(CONFIG_MISC) += misc-uclass.o +obj-$(CONFIG_$(SPL_TPL_)MISC) += misc-uclass.o obj-$(CONFIG_$(SPL_TPL_)CROS_EC) += cros_ec.o obj-$(CONFIG_$(SPL_TPL_)CROS_EC_SANDBOX) += cros_ec_sandbox.o |