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 /include | |
| parent | 927a37df9f5ed33fc350b9cc509d9f50ffaf5cd2 (diff) | |
| parent | 48372a5af600b1b828d6e7affe3aaa74c78e8731 (diff) | |
| download | u-boot-82da478b8f8ed41ed8bdbd0269da36ef6aaef7e8.tar.gz u-boot-82da478b8f8ed41ed8bdbd0269da36ef6aaef7e8.tar.xz u-boot-82da478b8f8ed41ed8bdbd0269da36ef6aaef7e8.zip | |
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 'include')
| -rw-r--r-- | include/image.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/image.h b/include/image.h index 54f2b58ac5..bfe4e0b5e7 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 |