diff options
| author | Tom Rini | 2019-05-10 11:08:48 -0400 |
|---|---|---|
| committer | Tom Rini | 2019-05-10 11:08:48 -0400 |
| commit | 82da478b8f8ed41ed8bdbd0269da36ef6aaef7e8 (patch) | |
| tree | bd4e014a0d7f6c63a6852cf81f98454bba066381 | |
| 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
| -rw-r--r-- | cmd/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/mtd/ubi/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/sysreset/Kconfig | 2 | ||||
| -rw-r--r-- | include/image.h | 1 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 2 |
5 files changed, 1 insertions, 7 deletions
diff --git a/cmd/Kconfig b/cmd/Kconfig index 4e11e0f404c..fd1beb06849 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -1933,7 +1933,6 @@ endmenu config CMD_UBI tristate "Enable UBI - Unsorted block images commands" - select CRC32 select MTD_UBI help UBI is a software layer above MTD layer which admits use of LVM-like @@ -1949,7 +1948,6 @@ config CMD_UBIFS tristate "Enable UBIFS - Unsorted block images filesystem commands" depends on CMD_UBI default y if CMD_UBI - select CRC32 select LZO help UBIFS is a file system for flash devices which works on top of UBI. diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig index cf847833562..2b17eae9470 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 d456f0ce36b..30aed2c4c15 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 diff --git a/include/image.h b/include/image.h index 54f2b58ac52..bfe4e0b5e7a 100644 --- a/include/image.h +++ b/include/image.h @@ -68,7 +68,6 @@ struct fdt_region; # define IMAGE_ENABLE_SHA1 1 # endif # else -# define CONFIG_CRC32 /* FIT images need CRC32 support */ # define IMAGE_ENABLE_CRC32 1 # define IMAGE_ENABLE_MD5 1 # define IMAGE_ENABLE_SHA1 1 diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 995811ce993..93f56434687 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -288,7 +288,6 @@ CONFIG_CPU_SH7780 CONFIG_CPU_TYPE_R CONFIG_CPU_VR41XX CONFIG_CQSPI_REF_CLK -CONFIG_CRC32 CONFIG_CS8900_BUS16 CONFIG_CS8900_BUS32 CONFIG_CSF_SIZE @@ -708,7 +707,6 @@ CONFIG_GLOBAL_TIMER CONFIG_GMII CONFIG_GOOD_SESH4 CONFIG_GPCNTRL -CONFIG_GPIO CONFIG_GPIO_ENABLE_SPI_FLASH CONFIG_GPIO_LED_INVERTED_TABLE CONFIG_GPIO_LED_STUBS |