diff options
Diffstat (limited to 'arch/arm/mach-imx/Kconfig')
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 46 |
1 files changed, 27 insertions, 19 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 7cb9138d24..1d6b4e1701 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -53,21 +53,6 @@ config ARCH_IMX_IMXIMAGE_SSL_SUPPORT This enables SSL support for the imx-image tool. This is required for created images for HABv3. This adds openssl to the build dependencies -config ARCH_IMX_XLOAD - bool - depends on ARCH_IMX51 - prompt "Build preloader image" - -config ARCH_IMX_UNUSED_IRAM_BASE - hex - depends on ARCH_IMX_XLOAD - default 0x1ffe2000 if ARCH_IMX51 - -config ARCH_IMX_UNUSED_IRAM_SIZE - hex - depends on ARCH_IMX_XLOAD - default 0x16000 if ARCH_IMX51 - config ARCH_IMX_EXTERNAL_BOOT_NAND bool depends on ARCH_IMX25 || ARCH_IMX27 || ARCH_IMX31 || ARCH_IMX35 @@ -242,6 +227,7 @@ config MACH_KINDLE_MX50 select MFD_MC13XXX select ARM_BOARD_APPEND_ATAG select ARM_LINUX + select OFTREE help Say Y here if you are using the fourth or fifth generation Amazon Kindle Model No. D01100 (Kindle Wi-Fi), D01200 (Kindle Touch) or @@ -433,7 +419,7 @@ config MACH_ZII_RDU2 select ARCH_IMX6 config MACH_ZII_VF610_DEV - bool "Zodiac VF610 Dev Family" + bool "ZII VF610 Dev Family" select ARCH_VF610 select CLKDEV_LOOKUP @@ -767,7 +753,29 @@ config HABV4 help High Assurance Boot, as found on i.MX28/i.MX6. -if HABV4 +config HAB_CERTS_ENV + depends on HAB + bool "Specify certificates in environment" + help + If this option is enabled the pathes to the HAB certificates are + taken from environment variables which allows for better integration + with build systems. With this option disabled the pathes can be + specified below. + + The environment variables have the same name as the corresponding + Kconfig variables. For HABv3 these are: + + CONFIG_HABV3_SRK_PEM + CONFIG_HABV3_CSF_CRT_DER + CONFIG_HABV3_IMG_CRT_DER + + For HABv4: + + CONFIG_HABV4_TABLE_BIN + CONFIG_HABV4_CSF_CRT_PEM + CONFIG_HABV4_IMG_CRT_PEM + +if HABV4 && !HAB_CERTS_ENV config HABV4_TABLE_BIN string "Path to SRK table" @@ -791,7 +799,7 @@ config HABV4_CSF_CRT_PEM config HABV4_IMG_CRT_PEM string "Path to IMG certificate" - default "../crts/IMG_1_sha256_4096_65537_v3_usr_crt.pem" + default "../crts/IMG1_1_sha256_4096_65537_v3_usr_crt.pem" help Path to the Image certificate, produced by the Freescale Public Key Infrastructure (PKI) script. @@ -810,7 +818,7 @@ config HABV3 help High Assurance Boot, as found on i.MX25. -if HABV3 +if HABV3 && !HAB_CERTS_ENV config HABV3_SRK_PEM string "Path to SRK Certificate (PEM)" |