imx8m: update clock root and fix core_sel

[oweals/u-boot.git] / arch / arm / mach-imx / Kconfig

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index b0b9d2c070ed7b75a5462dcc6282bc01754a9dad..329149900a501b435bfe3d93d05d141ae52a7a35 100644 (file)
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -41,7 +41,7 @@ config IMX_HAB
        imply CMD_DEKBLOB
        help
          This option enables the support for secure boot (HAB).
-         See doc/README.mxc_hab for more details.
+         See doc/imx/habv4/* for more details.
 
 config CSF_SIZE
        hex "Maximum size for Command Sequence File (CSF) binary"
@@ -69,7 +69,7 @@ config CMD_DEKBLOB
        help
          This enables the 'dek_blob' command which is used with the
          Freescale secure boot mechanism. This command encapsulates and
-         creates a blob of data. See also CMD_BLOB and doc/README.mxc_hab for
+         creates a blob of data. See also CMD_BLOB and doc/imx/habv4/* for
          more information.
 
 config CMD_HDMIDETECT
@@ -80,8 +80,9 @@ config CMD_HDMIDETECT
 
 config CMD_NANDBCB
        bool "i.MX6 NAND Boot Control Block(BCB) command"
-       depends on NAND && CMD_MTDPARTS
-       default y if ARCH_MX6 && NAND_MXS
+       depends on MTD_RAW_NAND && CMD_MTDPARTS
+       select BCH if MX6UL || MX6ULL
+       default y if (ARCH_MX6 && NAND_MXS) || (ARCH_MX7 && NAND_MXS)
        help
          Unlike normal 'nand write/erase' commands, this command update
          Boot Control Block(BCB) for i.MX6 platform NAND IP's.
@@ -108,3 +109,17 @@ config DDRMC_VF610_CALIBRATION
          NXP does NOT recommend to perform this calibration at each boot. One
          shall perform it on a new PCB and then use those values to program
          the ddrmc_cr_setting on relevant board file.
+
+config SPL_IMX_ROMAPI_LOADADDR
+       hex "Default load address to load image through ROM API"
+       depends on IMX8MN || IMX8MP
+
+config IMX_DCD_ADDR
+       hex "DCD Blocks location on the image"
+       default 0x00910000 if !ARCH_MX7ULP
+       default 0x2f010000 if ARCH_MX7ULP
+       help
+         Indicates where the Device Configuration Data, a binary table used by
+         the ROM code to configure the device at early boot stage, is located.
+         This information is shared with the user via mkimage -l just so the
+         image can be signed.