projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-imx
[platform/kernel/u-boot.git]
/
include
/
configs
/
colibri_imx7.h
diff --git
a/include/configs/colibri_imx7.h
b/include/configs/colibri_imx7.h
index
b3601ab
..
85dd891
100644
(file)
--- a/
include/configs/colibri_imx7.h
+++ b/
include/configs/colibri_imx7.h
@@
-208,8
+208,6
@@
#define CONFIG_MXC_USB_FLAGS 0
#define CONFIG_USB_MAX_CONTROLLER_COUNT 2
-#define CONFIG_IMX_THERMAL
-
#define CONFIG_USBD_HS
#if defined(CONFIG_VIDEO) || defined(CONFIG_DM_VIDEO)