diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-10-14 08:46:36 (GMT) |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-10-14 08:46:36 (GMT) |
| commit | 13a3972585af60ec367d209cedbd3601e0c77467 (patch) | |
| tree | 4b3312669b3e501f6bc10b39d8c7bbf516f07aac /configs/cm_fx6_defconfig | |
| parent | 208bd51396fb606dbdcf45b064e6b372d7dd3e81 (diff) | |
| parent | 297faccca2235e359012118495b9b73451d54bb9 (diff) | |
| download | u-boot-13a3972585af60ec367d209cedbd3601e0c77467.tar.xz | |
Merge remote-tracking branch 'u-boot/master'
Diffstat (limited to 'configs/cm_fx6_defconfig')
| -rw-r--r-- | configs/cm_fx6_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig index b50abab..bcd1820 100644 --- a/configs/cm_fx6_defconfig +++ b/configs/cm_fx6_defconfig @@ -3,6 +3,7 @@ CONFIG_ARCH_MX6=y CONFIG_TARGET_CM_FX6=y CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL" +CONFIG_SYS_PROMPT="CM-FX6 # " # CONFIG_CMD_IMLS is not set # CONFIG_CMD_XIMG is not set # CONFIG_CMD_LOADB is not set @@ -28,5 +29,4 @@ CONFIG_USB=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_STORAGE=y CONFIG_USB_KEYBOARD=y -CONFIG_SYS_PROMPT="CM-FX6 # " CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE=y |