diff options
| author | Tom Rini <trini@konsulko.com> | 2019-06-21 14:11:11 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-06-21 14:11:11 -0400 |
| commit | 271dc9ce7f9652e2fe3794871900fef292a9777b (patch) | |
| tree | 809041444563947c9df97e6e7149abf79c9431b6 /configs/colibri_imx7_defconfig | |
| parent | 226a35ef0ef310d8fffa3e6283ee3aab9dab26aa (diff) | |
| parent | f5128514137633ee951b1c484945bec9092c4e99 (diff) | |
Merge branch '2019-06-21-master-imports'
- Assorted small fixes
- Bugfix RSA handling code to reject images with unknown padding.
- Some boards disabled unused features to turn off DM warnings.
Diffstat (limited to 'configs/colibri_imx7_defconfig')
| -rw-r--r-- | configs/colibri_imx7_defconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/configs/colibri_imx7_defconfig b/configs/colibri_imx7_defconfig index efbf5f55a3..e5e4168285 100644 --- a/configs/colibri_imx7_defconfig +++ b/configs/colibri_imx7_defconfig @@ -2,7 +2,6 @@ CONFIG_ARM=y CONFIG_SYS_THUMB_BUILD=y CONFIG_ARCH_MX7=y CONFIG_SYS_TEXT_BASE=0x87800000 -CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SECURE_BOOT=y CONFIG_TARGET_COLIBRI_IMX7=y CONFIG_NR_DRAM_BANKS=1 @@ -66,8 +65,8 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_IMX7=y CONFIG_DM_PMIC=y CONFIG_PMIC_RN5T567=y -CONFIG_DM_USB=y CONFIG_USB=y +CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Toradex" |