mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-03-16 23:07:00 +00:00
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
This commit is contained in:
commit
82da478b8f
5 changed files with 1 additions and 7 deletions
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue