diff options
| author | Tom Rini | 2015-07-03 08:36:29 -0400 |
|---|---|---|
| committer | Tom Rini | 2015-07-03 08:41:02 -0400 |
| commit | 808bf7cf655a1caa5f48f6f3a6b274f4b83ab8b4 (patch) | |
| tree | 8f45f687f0205be120412d87a63c36bda6ee8ae0 /include/configs/mx6_common.h | |
| parent | 891b487098ee2169a16b1bbb354aaef28aa90630 (diff) | |
| parent | aa5a0d98943e1b32109fd1fb325007c6cdcedc50 (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Conflicts:
configs/tbs2910_defconfig
configs/tqma6q_mba6_mmc_defconfig
configs/tqma6q_mba6_spi_defconfig
configs/tqma6s_mba6_mmc_defconfig
configs/tqma6s_mba6_spi_defconfig
include/configs/mx6_common.h
Signed-off-by: Tom Rini <trini@konsulko.com>
Diffstat (limited to 'include/configs/mx6_common.h')
| -rw-r--r-- | include/configs/mx6_common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 2ef3201de18..86d7b167775 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -86,7 +86,7 @@ #define CONFIG_CMD_FAT /* Miscellaneous configurable options */ -#define CONFIG_SYS_NO_FLASH +#undef CONFIG_CMD_IMLS #define CONFIG_SYS_LONGHELP #define CONFIG_SYS_HUSH_PARSER #define CONFIG_CMDLINE_EDITING |