The SPL option for USB gadget should be named after the option for u-boot (CONFIG_USB_GADGET) Conflicts: arch/arm/mach-imx/mx6/Kconfig arch/arm/mach-imx/spl.c configs/am335x_boneblack_vboot_defconfig configs/am335x_evm_usbspl_defconfig configs/am43xx_evm_defconfig configs/am43xx_hs_evm_defconfig configs/imx6q_logic_defconfig configs/mx6memcal_defconfig configs/mx6sabresd_defconfig configs/pico-hobbit-imx6ul_defconfig configs/pico-hobbit-imx7d_defconfig configs/pico-imx6ul_defconfig configs/pico-imx7d_defconfig configs/pico-pi-imx6ul_defconfig configs/pico-pi-imx7d_defconfig drivers/Makefile Change-Id: I51305422f13cb7d743274f82c531000c0f93c144 Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com> Signed-off-by: Frank Wang <frank.wang@rock-chips.com> (cherry picked from commit f811e9763f4b6f6f5e3fe9c2fa30d2b6c62d289e) |
||
|---|---|---|
| .. | ||
| mx5 | ||
| mx6 | ||
| mx7 | ||
| mx7ulp | ||
| Kconfig | ||
| Makefile | ||
| cache.c | ||
| cmd_bmode.c | ||
| cmd_dek.c | ||
| cmd_hdmidet.c | ||
| cpu.c | ||
| ddrmc-vf610.c | ||
| hab.c | ||
| i2c-mxv7.c | ||
| imx_bootaux.c | ||
| init.c | ||
| iomux-v3.c | ||
| misc.c | ||
| rdc-sema.c | ||
| sata.c | ||
| speed.c | ||
| spl.c | ||
| spl_sd.cfg | ||
| syscounter.c | ||
| timer.c | ||
| video.c | ||