Commit 168d1e020595500ea1e39c19c939beaa12b9fa93
1 parent
2cd26c9243
Exists in
smarc_8mq_lf_v2020.04
and in
4 other branches
MLK-18159-12 imx: cmd_dek: Enable DEK only for chips supporting CAAM
Since cmd_dek is using CAAM JR, so enable the CMD_DEK only when HAS_CAAM is set Signed-off-by: Ye Li <ye.li@nxp.com> (cherry picked from commit 8a552c8d98df953c13a0144972b8c16ed7684e92) (cherry picked from commit dd3c14ba3f814610af05b07ec7cd47dcf0925a49)
Showing 1 changed file with 1 additions and 1 deletions Inline Diff
arch/arm/mach-imx/Kconfig
1 | config HAS_CAAM | 1 | config HAS_CAAM |
2 | bool | 2 | bool |
3 | 3 | ||
4 | config IMX_CONFIG | 4 | config IMX_CONFIG |
5 | string | 5 | string |
6 | 6 | ||
7 | config ROM_UNIFIED_SECTIONS | 7 | config ROM_UNIFIED_SECTIONS |
8 | bool | 8 | bool |
9 | 9 | ||
10 | config SYSCOUNTER_TIMER | 10 | config SYSCOUNTER_TIMER |
11 | bool | 11 | bool |
12 | 12 | ||
13 | config GPT_TIMER | 13 | config GPT_TIMER |
14 | bool | 14 | bool |
15 | 15 | ||
16 | config IMX_RDC | 16 | config IMX_RDC |
17 | bool "i.MX Resource domain controller driver" | 17 | bool "i.MX Resource domain controller driver" |
18 | depends on ARCH_MX6 || ARCH_MX7 | 18 | depends on ARCH_MX6 || ARCH_MX7 |
19 | help | 19 | help |
20 | i.MX Resource domain controller is used to assign masters | 20 | i.MX Resource domain controller is used to assign masters |
21 | and peripherals to differet domains. This can be used to | 21 | and peripherals to differet domains. This can be used to |
22 | isolate resources. | 22 | isolate resources. |
23 | 23 | ||
24 | config IMX_BOOTAUX | 24 | config IMX_BOOTAUX |
25 | bool "Support boot auxiliary core" | 25 | bool "Support boot auxiliary core" |
26 | depends on ARCH_MX7 || ARCH_MX6 || ARCH_VF610 || ARCH_IMX8 || ARCH_IMX8M | 26 | depends on ARCH_MX7 || ARCH_MX6 || ARCH_VF610 || ARCH_IMX8 || ARCH_IMX8M |
27 | help | 27 | help |
28 | bootaux [addr] to boot auxiliary core. | 28 | bootaux [addr] to boot auxiliary core. |
29 | 29 | ||
30 | config USE_IMXIMG_PLUGIN | 30 | config USE_IMXIMG_PLUGIN |
31 | bool "Use imximage plugin code" | 31 | bool "Use imximage plugin code" |
32 | depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX7ULP | 32 | depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX7ULP |
33 | help | 33 | help |
34 | i.MX6/7 supports DCD and Plugin. Enable this configuration | 34 | i.MX6/7 supports DCD and Plugin. Enable this configuration |
35 | to use Plugin, otherwise DCD will be used. | 35 | to use Plugin, otherwise DCD will be used. |
36 | 36 | ||
37 | config IMX_HAB | 37 | config IMX_HAB |
38 | bool "Support i.MX HAB features" | 38 | bool "Support i.MX HAB features" |
39 | depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5 || ARCH_IMX8M | 39 | depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5 || ARCH_IMX8M |
40 | select FSL_CAAM if HAS_CAAM | 40 | select FSL_CAAM if HAS_CAAM |
41 | imply CMD_DEKBLOB | 41 | imply CMD_DEKBLOB if HAS_CAAM |
42 | help | 42 | help |
43 | This option enables the support for secure boot (HAB). | 43 | This option enables the support for secure boot (HAB). |
44 | See doc/README.mxc_hab for more details. | 44 | See doc/README.mxc_hab for more details. |
45 | 45 | ||
46 | config CSF_SIZE | 46 | config CSF_SIZE |
47 | hex "Maximum size for Command Sequence File (CSF) binary" | 47 | hex "Maximum size for Command Sequence File (CSF) binary" |
48 | default 0x2060 | 48 | default 0x2060 |
49 | help | 49 | help |
50 | Define the maximum size for Command Sequence File (CSF) binary | 50 | Define the maximum size for Command Sequence File (CSF) binary |
51 | this information is used to define the image boot data. | 51 | this information is used to define the image boot data. |
52 | 52 | ||
53 | config CMD_BMODE | 53 | config CMD_BMODE |
54 | bool "Support the 'bmode' command" | 54 | bool "Support the 'bmode' command" |
55 | default y | 55 | default y |
56 | depends on ARCH_MX6 || ARCH_MX5 | 56 | depends on ARCH_MX6 || ARCH_MX5 |
57 | help | 57 | help |
58 | This enables the 'bmode' (bootmode) command for forcing | 58 | This enables the 'bmode' (bootmode) command for forcing |
59 | a boot from specific media. | 59 | a boot from specific media. |
60 | 60 | ||
61 | This is useful for forcing the ROM's usb downloader to | 61 | This is useful for forcing the ROM's usb downloader to |
62 | activate upon a watchdog reset which is nice when iterating | 62 | activate upon a watchdog reset which is nice when iterating |
63 | on U-Boot. Using the reset button or running bmode normal | 63 | on U-Boot. Using the reset button or running bmode normal |
64 | will set it back to normal. This command currently | 64 | will set it back to normal. This command currently |
65 | supports i.MX53 and i.MX6. | 65 | supports i.MX53 and i.MX6. |
66 | 66 | ||
67 | config CMD_DEKBLOB | 67 | config CMD_DEKBLOB |
68 | bool "Support the 'dek_blob' command" | 68 | bool "Support the 'dek_blob' command" |
69 | help | 69 | help |
70 | This enables the 'dek_blob' command which is used with the | 70 | This enables the 'dek_blob' command which is used with the |
71 | Freescale secure boot mechanism. This command encapsulates and | 71 | Freescale secure boot mechanism. This command encapsulates and |
72 | creates a blob of data. See also CMD_BLOB and doc/README.mxc_hab for | 72 | creates a blob of data. See also CMD_BLOB and doc/README.mxc_hab for |
73 | more information. | 73 | more information. |
74 | 74 | ||
75 | config CMD_HDMIDETECT | 75 | config CMD_HDMIDETECT |
76 | bool "Support the 'hdmidet' command" | 76 | bool "Support the 'hdmidet' command" |
77 | help | 77 | help |
78 | This enables the 'hdmidet' command which detects if an HDMI monitor | 78 | This enables the 'hdmidet' command which detects if an HDMI monitor |
79 | is connected. | 79 | is connected. |
80 | 80 | ||
81 | config CMD_NANDBCB | 81 | config CMD_NANDBCB |
82 | bool "i.MX6 NAND Boot Control Block(BCB) command" | 82 | bool "i.MX6 NAND Boot Control Block(BCB) command" |
83 | depends on MTD_RAW_NAND && CMD_MTDPARTS | 83 | depends on MTD_RAW_NAND && CMD_MTDPARTS |
84 | select BCH if MX6UL || MX6ULL | 84 | select BCH if MX6UL || MX6ULL |
85 | default y if (ARCH_MX6 && NAND_MXS) || (ARCH_MX7 && NAND_MXS) | 85 | default y if (ARCH_MX6 && NAND_MXS) || (ARCH_MX7 && NAND_MXS) |
86 | help | 86 | help |
87 | Unlike normal 'nand write/erase' commands, this command update | 87 | Unlike normal 'nand write/erase' commands, this command update |
88 | Boot Control Block(BCB) for i.MX6 platform NAND IP's. | 88 | Boot Control Block(BCB) for i.MX6 platform NAND IP's. |
89 | 89 | ||
90 | This is similar to kobs-ng, which is used in Linux as separate | 90 | This is similar to kobs-ng, which is used in Linux as separate |
91 | rootfs package. | 91 | rootfs package. |
92 | 92 | ||
93 | config NXP_BOARD_REVISION | 93 | config NXP_BOARD_REVISION |
94 | bool "Read NXP board revision from fuses" | 94 | bool "Read NXP board revision from fuses" |
95 | depends on ARCH_MX6 || ARCH_MX7 | 95 | depends on ARCH_MX6 || ARCH_MX7 |
96 | help | 96 | help |
97 | NXP boards based on i.MX6/7 contain the board revision information | 97 | NXP boards based on i.MX6/7 contain the board revision information |
98 | stored in the fuses. Select this option if you want to be able to | 98 | stored in the fuses. Select this option if you want to be able to |
99 | retrieve the board revision information. | 99 | retrieve the board revision information. |
100 | 100 | ||
101 | config DDRMC_VF610_CALIBRATION | 101 | config DDRMC_VF610_CALIBRATION |
102 | bool "Enable DDRMC (DDR3) on-chip calibration" | 102 | bool "Enable DDRMC (DDR3) on-chip calibration" |
103 | depends on ARCH_VF610 | 103 | depends on ARCH_VF610 |
104 | help | 104 | help |
105 | Vybrid (vf610) SoC provides some on-chip facility to tune the DDR3 | 105 | Vybrid (vf610) SoC provides some on-chip facility to tune the DDR3 |
106 | memory parameters. Select this option if you want to calculate them | 106 | memory parameters. Select this option if you want to calculate them |
107 | at boot time. | 107 | at boot time. |
108 | NOTE: | 108 | NOTE: |
109 | NXP does NOT recommend to perform this calibration at each boot. One | 109 | NXP does NOT recommend to perform this calibration at each boot. One |
110 | shall perform it on a new PCB and then use those values to program | 110 | shall perform it on a new PCB and then use those values to program |
111 | the ddrmc_cr_setting on relevant board file. | 111 | the ddrmc_cr_setting on relevant board file. |
112 | 112 | ||
113 | config SPL_IMX_ROMAPI_LOADADDR | 113 | config SPL_IMX_ROMAPI_LOADADDR |
114 | hex "Default load address to load image through ROM API" | 114 | hex "Default load address to load image through ROM API" |
115 | depends on IMX8MN || IMX8MP | 115 | depends on IMX8MN || IMX8MP |
116 | 116 | ||
117 | config IMX_DCD_ADDR | 117 | config IMX_DCD_ADDR |
118 | hex "DCD Blocks location on the image" | 118 | hex "DCD Blocks location on the image" |
119 | default 0x00910000 if !ARCH_MX7ULP | 119 | default 0x00910000 if !ARCH_MX7ULP |
120 | default 0x2f010000 if ARCH_MX7ULP | 120 | default 0x2f010000 if ARCH_MX7ULP |
121 | help | 121 | help |
122 | Indicates where the Device Configuration Data, a binary table used by | 122 | Indicates where the Device Configuration Data, a binary table used by |
123 | the ROM code to configure the device at early boot stage, is located. | 123 | the ROM code to configure the device at early boot stage, is located. |
124 | This information is shared with the user via mkimage -l just so the | 124 | This information is shared with the user via mkimage -l just so the |
125 | image can be signed. | 125 | image can be signed. |
126 | 126 |