diff options
author | Tom Rini <trini@konsulko.com> | 2018-11-12 08:06:34 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2018-11-12 08:06:34 -0500 |
commit | c80cc3df3d196302c401e45c92d8a769c55e78e9 (patch) | |
tree | a036263518d891bed01291e9cbe57dac0acddbc7 /configs | |
parent | 26cc40d8c4aaa8bd69055fb00d0737332661a879 (diff) | |
parent | 43e6f94cbcaf193aeedcf86e85a3ff4c79f66773 (diff) | |
download | u-boot-c80cc3df3d196302c401e45c92d8a769c55e78e9.tar.gz u-boot-c80cc3df3d196302c401e45c92d8a769c55e78e9.tar.bz2 u-boot-c80cc3df3d196302c401e45c92d8a769c55e78e9.zip |
Merge tag 'u-boot-imx-20181112' of git://git.denx.de/u-boot-imx
Fix build vf boards + fix gpr_init()
Diffstat (limited to 'configs')
-rw-r--r-- | configs/colibri_vf_defconfig | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/configs/colibri_vf_defconfig b/configs/colibri_vf_defconfig index 5854910f7b..fb0578868d 100644 --- a/configs/colibri_vf_defconfig +++ b/configs/colibri_vf_defconfig @@ -14,6 +14,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_ARCH_MISC_INIT=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y +# CONFIG_CMDLINE_EDITING is not set # CONFIG_AUTO_COMPLETE is not set CONFIG_SYS_PROMPT="Colibri VFxx # " CONFIG_CMD_BOOTZ=y @@ -23,7 +24,6 @@ CONFIG_CMD_DFU=y CONFIG_CMD_FUSE=y CONFIG_CMD_GPIO=y CONFIG_CMD_MMC=y -CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y # CONFIG_CMD_SETEXPR is not set @@ -55,9 +55,6 @@ CONFIG_PHY_MICREL=y CONFIG_MII=y CONFIG_DM_SERIAL=y CONFIG_FSL_LPUART=y -CONFIG_SPI=y -CONFIG_DM_SPI=y -CONFIG_FSL_DSPI=y CONFIG_USB=y CONFIG_DM_USB=y CONFIG_USB_EHCI_HCD=y @@ -72,3 +69,4 @@ CONFIG_VIDEO_FSL_DCU_FB=y CONFIG_VIDEO=y CONFIG_SYS_CONSOLE_FG_COL=0x00 CONFIG_OF_LIBFDT_OVERLAY=y +# CONFIG_EFI_UNICODE_CAPITALIZATION is not set |