projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
icore: configs: Fix merge conflict issue
[platform/kernel/u-boot.git]
/
configs
/
imx6qdl_icore_mmc_defconfig
diff --git
a/configs/imx6qdl_icore_mmc_defconfig
b/configs/imx6qdl_icore_mmc_defconfig
index
7a1735a
..
28e4ce9
100644
(file)
--- a/
configs/imx6qdl_icore_mmc_defconfig
+++ b/
configs/imx6qdl_icore_mmc_defconfig
@@
-36,7
+36,6
@@
CONFIG_CMD_FAT=y
CONFIG_CMD_FS_GENERIC=y
CONFIG_OF_LIST="imx6q-icore imx6dl-icore"
CONFIG_ENV_IS_IN_MMC=y
-# CONFIG_BLK is not set
CONFIG_SYS_I2C_MXC=y
CONFIG_PHYLIB=y
CONFIG_PHY_SMSC=y