diff options
| author | Tom Rini <trini@konsulko.com> | 2019-05-10 11:08:48 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-05-10 11:08:48 -0400 |
| commit | 82da478b8f8ed41ed8bdbd0269da36ef6aaef7e8 (patch) | |
| tree | bd4e014a0d7f6c63a6852cf81f98454bba066381 /drivers | |
| parent | 927a37df9f5ed33fc350b9cc509d9f50ffaf5cd2 (diff) | |
| parent | 48372a5af600b1b828d6e7affe3aaa74c78e8731 (diff) | |
Merge branch '2019-05-10-master-imports'
- Correct CONFIG_CRC32 related options in Kconfig
- CONFIG_GPIO select's DM_GPIO, drop CONFIG_GPIO from whitelist.txt
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mtd/ubi/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/sysreset/Kconfig | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig index cf84783356..2b17eae947 100644 --- a/drivers/mtd/ubi/Kconfig +++ b/drivers/mtd/ubi/Kconfig @@ -9,7 +9,6 @@ config CONFIG_UBI_SILENCE_MSG config MTD_UBI bool "Enable UBI - Unsorted block images" - select CRC32 select RBTREE select MTD_PARTITIONS help diff --git a/drivers/sysreset/Kconfig b/drivers/sysreset/Kconfig index d456f0ce36..30aed2c4c1 100644 --- a/drivers/sysreset/Kconfig +++ b/drivers/sysreset/Kconfig @@ -35,7 +35,7 @@ if SYSRESET config SYSRESET_GPIO bool "Enable support for GPIO reset driver" - select GPIO + select DM_GPIO help Reset support via GPIO pin connected reset logic. This is used for example on Microblaze where reset logic can be controlled via GPIO |