summaryrefslogtreecommitdiff
path: root/configs/colibri-imx8qxp_defconfig
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-06-21 14:11:11 -0400
committerTom Rini <trini@konsulko.com>2019-06-21 14:11:11 -0400
commit271dc9ce7f9652e2fe3794871900fef292a9777b (patch)
tree809041444563947c9df97e6e7149abf79c9431b6 /configs/colibri-imx8qxp_defconfig
parent226a35ef0ef310d8fffa3e6283ee3aab9dab26aa (diff)
parentf5128514137633ee951b1c484945bec9092c4e99 (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-imx8qxp_defconfig')
-rw-r--r--configs/colibri-imx8qxp_defconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/configs/colibri-imx8qxp_defconfig b/configs/colibri-imx8qxp_defconfig
index d808bd7608..8d6c0788f1 100644
--- a/configs/colibri-imx8qxp_defconfig
+++ b/configs/colibri-imx8qxp_defconfig
@@ -3,8 +3,8 @@ CONFIG_ARCH_IMX8=y
CONFIG_SYS_TEXT_BASE=0x80020000
CONFIG_SYS_MALLOC_F_LEN=0x4000
CONFIG_TARGET_COLIBRI_IMX8X=y
-CONFIG_DISTRO_DEFAULTS=y
CONFIG_NR_DRAM_BANKS=3
+CONFIG_DISTRO_DEFAULTS=y
CONFIG_FIT=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri-imx8x/colibri-imx8qxp-imximage.cfg"
CONFIG_LOG=y
@@ -52,5 +52,4 @@ CONFIG_DM_REGULATOR_GPIO=y
CONFIG_DM_SERIAL=y
CONFIG_FSL_LPUART=y
CONFIG_DM_THERMAL=y
-CONFIG_IMX_SCU_THERMAL=y
# CONFIG_EFI_LOADER is not set