Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit ff0854ff803d6f3944843a0a012e1a85a0befcba

Authored by Alice Guo
Committed by Ye Li
1 parent 14772d11c4
Exists in smarc_8mm-imx_v2019.04_4.19.35_1.1.0 and in 1 other branch smarc_8m-imx_v2019.04_4.19.35_1.1.0

MLK-22580-2: imx8mm-evk: config: add some dependencies and modify 

dependency of CMD_NANDBCB`s default value

compiling nandbcb of imx8mm-evk depends on NAND and CMD_MTDPARTS

modify dependency of CMD_NANDBCB`s default value

Signed-off-by: Alice Guo <alice.guo@nxp.com>
(cherry picked from commit 1b14e8cbefdb0f8126ceb6a85b1fd0db142328e6)

Showing 2 changed files with 4 additions and 1 deletions Inline Diff

arch/arm/mach-imx/Kconfig
Diff comments   View file @ ff0854f
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 IMX_OPTEE 7 config IMX_OPTEE
8 bool "Support OP-TEE" 8 bool "Support OP-TEE"
9 help 9 help
10 Enable support for OP-TEE 10 Enable support for OP-TEE
11 11
12 config ROM_UNIFIED_SECTIONS 12 config ROM_UNIFIED_SECTIONS
13 bool 13 bool
14 14
15 config SYSCOUNTER_TIMER 15 config SYSCOUNTER_TIMER
16 bool 16 bool
17 17
18 config GPT_TIMER 18 config GPT_TIMER
19 bool 19 bool
20 20
21 config FSL_CAAM_KB 21 config FSL_CAAM_KB
22 bool 22 bool
23 23
24 config IMX_SEC_INIT 24 config IMX_SEC_INIT
25 bool 25 bool
26 help 26 help
27 In most of i.MX board with CAAM this option is used 27 In most of i.MX board with CAAM this option is used
28 to init RNG from U-Boot 28 to init RNG from U-Boot
29 select FSL_CAAM_KB 29 select FSL_CAAM_KB
30 select SPL_CRYPTO_SUPPORT if SPL 30 select SPL_CRYPTO_SUPPORT if SPL
31 31
32 config IMX_RDC 32 config IMX_RDC
33 bool "i.MX Resource domain controller driver" 33 bool "i.MX Resource domain controller driver"
34 depends on ARCH_MX6 || ARCH_MX7 34 depends on ARCH_MX6 || ARCH_MX7
35 help 35 help
36 i.MX Resource domain controller is used to assign masters 36 i.MX Resource domain controller is used to assign masters
37 and peripherals to differet domains. This can be used to 37 and peripherals to differet domains. This can be used to
38 isolate resources. 38 isolate resources.
39 39
40 config IMX_BOOTAUX 40 config IMX_BOOTAUX
41 bool "Support boot auxiliary core" 41 bool "Support boot auxiliary core"
42 depends on ARCH_MX7 || ARCH_MX6 || ARCH_IMX8 || ARCH_IMX8M 42 depends on ARCH_MX7 || ARCH_MX6 || ARCH_IMX8 || ARCH_IMX8M
43 help 43 help
44 bootaux [addr] to boot auxiliary core. 44 bootaux [addr] to boot auxiliary core.
45 45
46 config IMX_VSERVICE_SHARED_BUFFER 46 config IMX_VSERVICE_SHARED_BUFFER
47 hex "Define the buffer address used for virtual service" 47 hex "Define the buffer address used for virtual service"
48 depends on IMX_VSERVICE 48 depends on IMX_VSERVICE
49 help 49 help
50 IMX virtual service will use this buffer for exchanging data with remote core. 50 IMX virtual service will use this buffer for exchanging data with remote core.
51 51
52 config IMX_VSERVICE_SHARED_BUFFER_SIZE 52 config IMX_VSERVICE_SHARED_BUFFER_SIZE
53 hex "Define the size of buffer address used for virtual service" 53 hex "Define the size of buffer address used for virtual service"
54 default 0x400000 54 default 0x400000
55 depends on IMX_VSERVICE 55 depends on IMX_VSERVICE
56 help 56 help
57 The buffer size for IMX virtual service needs enough large to fit all possible message. 57 The buffer size for IMX virtual service needs enough large to fit all possible message.
58 58
59 config IMX_VSERVICE 59 config IMX_VSERVICE
60 bool 60 bool
61 select MISC 61 select MISC
62 select IMX_M4_MU 62 select IMX_M4_MU
63 help 63 help
64 This enables imx virtual service provides framework for imx virtual driver working. 64 This enables imx virtual service provides framework for imx virtual driver working.
65 65
66 config USE_IMXIMG_PLUGIN 66 config USE_IMXIMG_PLUGIN
67 bool "Use imximage plugin code" 67 bool "Use imximage plugin code"
68 depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX7ULP 68 depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX7ULP
69 help 69 help
70 i.MX6/7 supports DCD and Plugin. Enable this configuration 70 i.MX6/7 supports DCD and Plugin. Enable this configuration
71 to use Plugin, otherwise DCD will be used. 71 to use Plugin, otherwise DCD will be used.
72 72
73 config SECURE_BOOT 73 config SECURE_BOOT
74 bool "Support i.MX HAB features" 74 bool "Support i.MX HAB features"
75 depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5 || ARCH_MX7ULP || ARCH_IMX8M 75 depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5 || ARCH_MX7ULP || ARCH_IMX8M
76 select FSL_CAAM if HAS_CAAM 76 select FSL_CAAM if HAS_CAAM
77 imply CMD_DEKBLOB if HAS_CAAM 77 imply CMD_DEKBLOB if HAS_CAAM
78 help 78 help
79 This option enables the support for secure boot (HAB). 79 This option enables the support for secure boot (HAB).
80 See doc/README.mxc_hab for more details. 80 See doc/README.mxc_hab for more details.
81 81
82 config CMD_BMODE 82 config CMD_BMODE
83 bool "Support the 'bmode' command" 83 bool "Support the 'bmode' command"
84 default y 84 default y
85 depends on ARCH_MX6 || ARCH_MX5 85 depends on ARCH_MX6 || ARCH_MX5
86 help 86 help
87 This enables the 'bmode' (bootmode) command for forcing 87 This enables the 'bmode' (bootmode) command for forcing
88 a boot from specific media. 88 a boot from specific media.
89 89
90 This is useful for forcing the ROM's usb downloader to 90 This is useful for forcing the ROM's usb downloader to
91 activate upon a watchdog reset which is nice when iterating 91 activate upon a watchdog reset which is nice when iterating
92 on U-Boot. Using the reset button or running bmode normal 92 on U-Boot. Using the reset button or running bmode normal
93 will set it back to normal. This command currently 93 will set it back to normal. This command currently
94 supports i.MX53 and i.MX6. 94 supports i.MX53 and i.MX6.
95 95
96 config CMD_DEKBLOB 96 config CMD_DEKBLOB
97 bool "Support the 'dek_blob' command" 97 bool "Support the 'dek_blob' command"
98 select IMX_CAAM_DEK_ENCAP if ARCH_MX6 || ARCH_MX7 || ARCH_MX7ULP 98 select IMX_CAAM_DEK_ENCAP if ARCH_MX6 || ARCH_MX7 || ARCH_MX7ULP
99 select IMX_OPTEE_DEK_ENCAP if ARCH_IMX8M 99 select IMX_OPTEE_DEK_ENCAP if ARCH_IMX8M
100 select IMX_SECO_DEK_ENCAP if ARCH_IMX8 100 select IMX_SECO_DEK_ENCAP if ARCH_IMX8
101 help 101 help
102 This enables the 'dek_blob' command which is used with the 102 This enables the 'dek_blob' command which is used with the
103 Freescale secure boot mechanism. This command encapsulates and 103 Freescale secure boot mechanism. This command encapsulates and
104 creates a blob of data. See also CMD_BLOB and doc/README.mxc_hab for 104 creates a blob of data. See also CMD_BLOB and doc/README.mxc_hab for
105 more information. 105 more information.
106 106
107 config IMX_CAAM_DEK_ENCAP 107 config IMX_CAAM_DEK_ENCAP
108 bool "Support the DEK blob encapsulation with CAAM U-Boot driver" 108 bool "Support the DEK blob encapsulation with CAAM U-Boot driver"
109 help 109 help
110 This enables the DEK blob encapsulation with the U-Boot CAAM driver. 110 This enables the DEK blob encapsulation with the U-Boot CAAM driver.
111 This option is only available on imx6, imx7 and imx7ulp. 111 This option is only available on imx6, imx7 and imx7ulp.
112 112
113 config IMX_OPTEE_DEK_ENCAP 113 config IMX_OPTEE_DEK_ENCAP
114 select TEE 114 select TEE
115 select OPTEE 115 select OPTEE
116 bool "Support the DEK blob encapsulation with OP-TEE" 116 bool "Support the DEK blob encapsulation with OP-TEE"
117 help 117 help
118 This enabled the DEK blob encapsulation with OP-TEE. The communication 118 This enabled the DEK blob encapsulation with OP-TEE. The communication
119 with OP-TEE is done through a SMC call and OP-TEE shared memory. This 119 with OP-TEE is done through a SMC call and OP-TEE shared memory. This
120 option is available on imx8mm. 120 option is available on imx8mm.
121 121
122 config IMX_SECO_DEK_ENCAP 122 config IMX_SECO_DEK_ENCAP
123 bool "Support the DEK blob encapsulation with SECO" 123 bool "Support the DEK blob encapsulation with SECO"
124 help 124 help
125 This enabled the DEK blob encapsulation with the SECO API. This option 125 This enabled the DEK blob encapsulation with the SECO API. This option
126 is only available on imx8. 126 is only available on imx8.
127 127
128 config CMD_PRIBLOB 128 config CMD_PRIBLOB
129 bool "Support the set_priblob_bitfield command" 129 bool "Support the set_priblob_bitfield command"
130 depends on HAS_CAAM && SECURE_BOOT 130 depends on HAS_CAAM && SECURE_BOOT
131 help 131 help
132 This option enables the priblob command which can be used 132 This option enables the priblob command which can be used
133 to set the priblob setting to 0x3. 133 to set the priblob setting to 0x3.
134 134
135 config CMD_HDMIDETECT 135 config CMD_HDMIDETECT
136 bool "Support the 'hdmidet' command" 136 bool "Support the 'hdmidet' command"
137 help 137 help
138 This enables the 'hdmidet' command which detects if an HDMI monitor 138 This enables the 'hdmidet' command which detects if an HDMI monitor
139 is connected. 139 is connected.
140 140
141 config FSL_MFGPROT 141 config FSL_MFGPROT
142 bool "Support the 'mfgprot' command" 142 bool "Support the 'mfgprot' command"
143 depends on SECURE_BOOT && ARCH_MX7 143 depends on SECURE_BOOT && ARCH_MX7
144 help 144 help
145 This option enables the manufacturing protection command 145 This option enables the manufacturing protection command
146 which can be used has a protection feature for Manufacturing 146 which can be used has a protection feature for Manufacturing
147 process. With this tool is possible to authenticate the 147 process. With this tool is possible to authenticate the
148 chip to the OEM's server. 148 chip to the OEM's server.
149 149
150 config DBG_MONITOR 150 config DBG_MONITOR
151 bool "Enable the AXI debug monitor" 151 bool "Enable the AXI debug monitor"
152 depends on ARCH_MX6 || ARCH_MX7 152 depends on ARCH_MX6 || ARCH_MX7
153 help 153 help
154 This option enables the debug monitor which prints out last 154 This option enables the debug monitor which prints out last
155 failed AXI access info when system reboot is caused by AXI 155 failed AXI access info when system reboot is caused by AXI
156 access failure. 156 access failure.
157 157
158 config CMD_NANDBCB 158 config CMD_NANDBCB
159 bool "i.MX6 NAND Boot Control Block(BCB) command" 159 bool "i.MX6 NAND Boot Control Block(BCB) command"
160 depends on NAND && CMD_MTDPARTS 160 depends on NAND && CMD_MTDPARTS
161 default y if (ARCH_MX6 && NAND_MXS) || (ARCH_MX7 && NAND_MXS) 161 default y if ((ARCH_MX6 || ARCH_MX7 || ARCH_IMX8M) && NAND_MXS)
162 help 162 help
163 Unlike normal 'nand write/erase' commands, this command update 163 Unlike normal 'nand write/erase' commands, this command update
164 Boot Control Block(BCB) for i.MX6 platform NAND IP's. 164 Boot Control Block(BCB) for i.MX6 platform NAND IP's.
165 165
166 This is similar to kobs-ng, which is used in Linux as separate 166 This is similar to kobs-ng, which is used in Linux as separate
167 rootfs package. 167 rootfs package.
168 168
169 config NXP_BOARD_REVISION 169 config NXP_BOARD_REVISION
170 bool "Read NXP board revision from fuses" 170 bool "Read NXP board revision from fuses"
171 depends on ARCH_MX6 || ARCH_MX7 171 depends on ARCH_MX6 || ARCH_MX7
172 help 172 help
173 NXP boards based on i.MX6/7 contain the board revision information 173 NXP boards based on i.MX6/7 contain the board revision information
174 stored in the fuses. Select this option if you want to be able to 174 stored in the fuses. Select this option if you want to be able to
175 retrieve the board revision information. 175 retrieve the board revision information.
176 176
177 config FLASH_MCUFIRMWARE_SUPPORT 177 config FLASH_MCUFIRMWARE_SUPPORT
178 bool "Enable mcu firmware flash support" 178 bool "Enable mcu firmware flash support"
179 depends on ARCH_MX7ULP || ARCH_IMX8M 179 depends on ARCH_MX7ULP || ARCH_IMX8M
180 help 180 help
181 This enables the mcu firmware flash support for some SOCs. 181 This enables the mcu firmware flash support for some SOCs.
182 182
183 config DDRMC_VF610_CALIBRATION 183 config DDRMC_VF610_CALIBRATION
184 bool "Enable DDRMC (DDR3) on-chip calibration" 184 bool "Enable DDRMC (DDR3) on-chip calibration"
185 depends on ARCH_VF610 185 depends on ARCH_VF610
186 help 186 help
187 Vybrid (vf610) SoC provides some on-chip facility to tune the DDR3 187 Vybrid (vf610) SoC provides some on-chip facility to tune the DDR3
188 memory parameters. Select this option if you want to calculate them 188 memory parameters. Select this option if you want to calculate them
189 at boot time. 189 at boot time.
190 NOTE: 190 NOTE:
191 NXP does NOT recommend to perform this calibration at each boot. One 191 NXP does NOT recommend to perform this calibration at each boot. One
192 shall perform it on a new PCB and then use those values to program 192 shall perform it on a new PCB and then use those values to program
193 the ddrmc_cr_setting on relevant board file. 193 the ddrmc_cr_setting on relevant board file.
194 194
195 config IMX_TRUSTY_OS 195 config IMX_TRUSTY_OS
196 bool "Support Trusty OS related feature" 196 bool "Support Trusty OS related feature"
197 depends on ARCH_MX6 || ARCH_MX7 || ARCH_IMX8 || ARCH_IMX8M 197 depends on ARCH_MX6 || ARCH_MX7 || ARCH_IMX8 || ARCH_IMX8M
198 select SYS_ARM_CACHE_WRITEALLOC 198 select SYS_ARM_CACHE_WRITEALLOC
199 199
200 config SYS_ARM_CACHE_WRITEALLOC 200 config SYS_ARM_CACHE_WRITEALLOC
201 bool "support cache write alloc" 201 bool "support cache write alloc"
202 202
configs/imx8mm_ddr4_evk_nand_defconfig
Diff comments   View file @ ff0854f
1 CONFIG_ARM=y 1 CONFIG_ARM=y
2 CONFIG_ARCH_IMX8M=y 2 CONFIG_ARCH_IMX8M=y
3 CONFIG_SYS_TEXT_BASE=0x40200000 3 CONFIG_SYS_TEXT_BASE=0x40200000
4 CONFIG_SYS_MALLOC_F_LEN=0x2000 4 CONFIG_SYS_MALLOC_F_LEN=0x2000
5 CONFIG_USB_TCPC=y 5 CONFIG_USB_TCPC=y
6 CONFIG_TARGET_IMX8MM_DDR4_EVK=y 6 CONFIG_TARGET_IMX8MM_DDR4_EVK=y
7 CONFIG_ARCH_MISC_INIT=y 7 CONFIG_ARCH_MISC_INIT=y
8 CONFIG_SPL=y 8 CONFIG_SPL=y
9 CONFIG_FIT=y 9 CONFIG_FIT=y
10 CONFIG_FIT_EXTERNAL_OFFSET=0x3000 10 CONFIG_FIT_EXTERNAL_OFFSET=0x3000
11 CONFIG_SPL_LOAD_FIT=y 11 CONFIG_SPL_LOAD_FIT=y
12 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" 12 CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh"
13 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg,SPL_TEXT_BASE=0x7E1000" 13 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/imx8m/imximage.cfg,SPL_TEXT_BASE=0x7E1000"
14 CONFIG_SPL_BOARD_INIT=y 14 CONFIG_SPL_BOARD_INIT=y
15 CONFIG_SPL_SERIAL_SUPPORT=y 15 CONFIG_SPL_SERIAL_SUPPORT=y
16 CONFIG_NR_DRAM_BANKS=1 16 CONFIG_NR_DRAM_BANKS=1
17 CONFIG_HUSH_PARSER=y 17 CONFIG_HUSH_PARSER=y
18 CONFIG_OF_LIBFDT=y 18 CONFIG_OF_LIBFDT=y
19 CONFIG_FS_FAT=y 19 CONFIG_FS_FAT=y
20 CONFIG_CMD_EXT2=y 20 CONFIG_CMD_EXT2=y
21 CONFIG_CMD_EXT4=y 21 CONFIG_CMD_EXT4=y
22 CONFIG_CMD_EXT4_WRITE=y 22 CONFIG_CMD_EXT4_WRITE=y
23 CONFIG_CMD_FAT=y 23 CONFIG_CMD_FAT=y
24 CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8mm-ddr4-evk" 24 CONFIG_DEFAULT_DEVICE_TREE="fsl-imx8mm-ddr4-evk"
25 CONFIG_DEFAULT_FDT_FILE="fsl-imx8mm-ddr4-evk.dtb" 25 CONFIG_DEFAULT_FDT_FILE="fsl-imx8mm-ddr4-evk.dtb"
26 CONFIG_CMD_I2C=y 26 CONFIG_CMD_I2C=y
27 CONFIG_CMD_GPIO=y 27 CONFIG_CMD_GPIO=y
28 CONFIG_CMD_CACHE=y 28 CONFIG_CMD_CACHE=y
29 CONFIG_CMD_REGULATOR=y 29 CONFIG_CMD_REGULATOR=y
30 CONFIG_CMD_MEMTEST=y 30 CONFIG_CMD_MEMTEST=y
31 CONFIG_OF_CONTROL=y 31 CONFIG_OF_CONTROL=y
32 CONFIG_FASTBOOT=y 32 CONFIG_FASTBOOT=y
33 CONFIG_USB_FUNCTION_FASTBOOT=y 33 CONFIG_USB_FUNCTION_FASTBOOT=y
34 CONFIG_CMD_FASTBOOT=y 34 CONFIG_CMD_FASTBOOT=y
35 CONFIG_ANDROID_BOOT_IMAGE=y 35 CONFIG_ANDROID_BOOT_IMAGE=y
36 CONFIG_FASTBOOT_UUU_SUPPORT=y 36 CONFIG_FASTBOOT_UUU_SUPPORT=y
37 CONFIG_FASTBOOT_BUF_ADDR=0x42800000 37 CONFIG_FASTBOOT_BUF_ADDR=0x42800000
38 CONFIG_FASTBOOT_BUF_SIZE=0x40000000 38 CONFIG_FASTBOOT_BUF_SIZE=0x40000000
39 CONFIG_FASTBOOT_FLASH=y 39 CONFIG_FASTBOOT_FLASH=y
40 40
41 CONFIG_DM_GPIO=y 41 CONFIG_DM_GPIO=y
42 CONFIG_DM_I2C=y 42 CONFIG_DM_I2C=y
43 CONFIG_SYS_I2C_MXC=y 43 CONFIG_SYS_I2C_MXC=y
44 CONFIG_DM_MMC=y 44 CONFIG_DM_MMC=y
45 # CONFIG_DM_PMIC=y 45 # CONFIG_DM_PMIC=y
46 CONFIG_EFI_PARTITION=y 46 CONFIG_EFI_PARTITION=y
47 CONFIG_DM_ETH=y 47 CONFIG_DM_ETH=y
48 CONFIG_PINCTRL=y 48 CONFIG_PINCTRL=y
49 CONFIG_PINCTRL_IMX8M=y 49 CONFIG_PINCTRL_IMX8M=y
50 CONFIG_DM_REGULATOR=y 50 CONFIG_DM_REGULATOR=y
51 CONFIG_DM_REGULATOR_FIXED=y 51 CONFIG_DM_REGULATOR_FIXED=y
52 CONFIG_DM_REGULATOR_GPIO=y 52 CONFIG_DM_REGULATOR_GPIO=y
53 CONFIG_NXP_TMU=y 53 CONFIG_NXP_TMU=y
54 CONFIG_DM_THERMAL=y 54 CONFIG_DM_THERMAL=y
55 CONFIG_USB=y 55 CONFIG_USB=y
56 CONFIG_USB_GADGET=y 56 CONFIG_USB_GADGET=y
57 CONFIG_DM_USB=y 57 CONFIG_DM_USB=y
58 CONFIG_CI_UDC=y 58 CONFIG_CI_UDC=y
59 CONFIG_USB_EHCI_HCD=y 59 CONFIG_USB_EHCI_HCD=y
60 60
61 CONFIG_USB_GADGET_MANUFACTURER="FSL" 61 CONFIG_USB_GADGET_MANUFACTURER="FSL"
62 CONFIG_USB_GADGET_VENDOR_NUM=0x0525 62 CONFIG_USB_GADGET_VENDOR_NUM=0x0525
63 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5 63 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
64 64
65 CONFIG_SPL_USB_HOST_SUPPORT=y 65 CONFIG_SPL_USB_HOST_SUPPORT=y
66 CONFIG_SPL_USB_GADGET=y 66 CONFIG_SPL_USB_GADGET=y
67 CONFIG_SPL_USB_SDP_SUPPORT=y 67 CONFIG_SPL_USB_SDP_SUPPORT=y
68 CONFIG_SDP_LOADADDR=0x40400000 68 CONFIG_SDP_LOADADDR=0x40400000
69 69
70 CONFIG_VIDEO=y 70 CONFIG_VIDEO=y
71 CONFIG_IMX_SEC_MIPI_DSI=y 71 CONFIG_IMX_SEC_MIPI_DSI=y
72 72
73 CONFIG_CMD_NAND=y 73 CONFIG_CMD_NAND=y
74 CONFIG_CMD_UBI=y 74 CONFIG_CMD_UBI=y
75 CONFIG_NAND_BOOT=y 75 CONFIG_NAND_BOOT=y
76 CONFIG_ENV_IS_IN_NAND=y 76 CONFIG_ENV_IS_IN_NAND=y
77 CONFIG_MTD=y 77 CONFIG_MTD=y
78 CONFIG_CMD_MTDPARTS=y
79 CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
80 CONFIG_MTDPARTS_SKIP_INVALID=y
78 CONFIG_NAND=y 81 CONFIG_NAND=y
79 CONFIG_NAND_MXS=y 82 CONFIG_NAND_MXS=y
80 CONFIG_NAND_MXS_DT=y 83 CONFIG_NAND_MXS_DT=y
81 84