Merge https://gitlab.denx.de/u-boot/custodians/u-boot-marvell

[oweals/u-boot.git] / board / toradex / colibri_imx7 / imximage.cfg

diff --git a/board/toradex/colibri_imx7/imximage.cfg b/board/toradex/colibri_imx7/imximage.cfg
index d891e82ae438b533de8bf7cdea3e024dc1871003..1b4f272bb62152db383212ca3b4a5855a6f9d71f 100644 (file)
--- a/board/toradex/colibri_imx7/imximage.cfg
+++ b/board/toradex/colibri_imx7/imximage.cfg
@@ -1,10 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Copyright (C) 2015 Freescale Semiconductor, Inc.
  *               2015 Toradex AG
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
- * Refer docs/README.imxmage for more details about how-to configure
+ * Refer doc/README.imximage for more details about how-to configure
  * and create imximage boot image
  *
  * The syntax is taken as close as possible with the kwbimage
@@ -26,7 +25,7 @@ BOOT_FROM     sd
 /*
  * Secure boot support
  */
-#ifdef CONFIG_SECURE_BOOT
+#ifdef CONFIG_IMX_HAB
 CSF CONFIG_CSF_SIZE
 #endif
 
@@ -58,7 +57,7 @@ DATA 4 0x307a01a4 0x00100020
 /* DDRC_DFIUPD2 */
 DATA 4 0x307a01a8 0x80100004
 /* DDRC_RFSHTMG */
-DATA 4 0x307a0064 0x00400045
+DATA 4 0x307a0064 0x00400046
 /* DDRC_MP_PCTRL_0 */
 DATA 4 0x307a0490 0x00000001
 /* DDRC_INIT0 */
@@ -74,15 +73,15 @@ DATA 4 0x307a00e4 0x00100004
 /* DDRC_RANKCTL */
 DATA 4 0x307a00f4 0x0000033f
 /* DDRC_DRAMTMG0 */
-DATA 4 0x307a0100 0x090b090a
+DATA 4 0x307a0100 0x0910090a
 /* DDRC_DRAMTMG1 */
-DATA 4 0x307a0104 0x000d020d
+DATA 4 0x307a0104 0x000d020e
 /* DDRC_DRAMTMG2 */
 DATA 4 0x307a0108 0x03040307
 /* DDRC_DRAMTMG3 */
 DATA 4 0x307a010c 0x00002006
 /* DDRC_DRAMTMG4 */
-DATA 4 0x307a0110 0x04020205
+DATA 4 0x307a0110 0x04020204
 /* DDRC_DRAMTMG5 */
 DATA 4 0x307a0114 0x03030202
 /* DDRC_DRAMTMG8 */
@@ -106,7 +105,7 @@ DATA 4 0x307a0218 0x07070707
 /* DDRC_ODTCFG */
 DATA 4 0x307a0240 0x06000601
 /* DDRC_ODTMAP */
-DATA 4 0x307a0244 0x00000011
+DATA 4 0x307a0244 0x00000001
 /* SRC_DDRC_RCR */
 DATA 4 0x30391000 0x00000000
 /* DDR_PHY_PHY_CON0 */