| Message ID | 1507819464-24321-1-git-send-email-jagan@amarulasolutions.com |
|---|---|
| State | Superseded |
| Delegated to: | Stefano Babic |
| Headers | show |
| Series | [U-Boot,v2,1/2] icore: configs: Fix merge conflict issue | expand |
On 12/10/2017 16:44, Jagan Teki wrote: > Fix for finding mmc devices on i.MX6Q icore boards > added in below comment > "icorem6: Fix to find MMC devices" > (sha1: a2b137b38d925df91afef52f5122927de024f81a) > > which is reverted in during u-boot-imx merge > " Merge git://git.denx.de/u-boot-imx" > (sha1: 6aee2ab68c362ace5a59f89a63abed82e0bf19e5) > > This patch, is recreated to fix merge conflict. > > Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> > --- > Changes for v2: > - None > > configs/imx6qdl_icore_mmc_defconfig | 1 - > configs/imx6qdl_icore_rqs_defconfig | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig > index 7a1735a..28e4ce9 100644 > --- 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 > diff --git a/configs/imx6qdl_icore_rqs_defconfig b/configs/imx6qdl_icore_rqs_defconfig > index 1d02ad0..fbe9651 100644 > --- a/configs/imx6qdl_icore_rqs_defconfig > +++ b/configs/imx6qdl_icore_rqs_defconfig > @@ -33,7 +33,6 @@ CONFIG_CMD_FAT=y > CONFIG_CMD_FS_GENERIC=y > CONFIG_OF_LIST="imx6q-icore-rqs imx6dl-icore-rqs" > CONFIG_ENV_IS_IN_MMC=y > -# CONFIG_BLK is not set > CONFIG_SYS_I2C_MXC=y > CONFIG_PHYLIB=y > CONFIG_PHY_MICREL=y > Reviewed-by: Stefano Babic <sbabic@denx.de> Best regards, Stefano Babic
diff --git a/configs/imx6qdl_icore_mmc_defconfig b/configs/imx6qdl_icore_mmc_defconfig index 7a1735a..28e4ce9 100644 --- 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 diff --git a/configs/imx6qdl_icore_rqs_defconfig b/configs/imx6qdl_icore_rqs_defconfig index 1d02ad0..fbe9651 100644 --- a/configs/imx6qdl_icore_rqs_defconfig +++ b/configs/imx6qdl_icore_rqs_defconfig @@ -33,7 +33,6 @@ CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y CONFIG_OF_LIST="imx6q-icore-rqs imx6dl-icore-rqs" CONFIG_ENV_IS_IN_MMC=y -# CONFIG_BLK is not set CONFIG_SYS_I2C_MXC=y CONFIG_PHYLIB=y CONFIG_PHY_MICREL=y
Fix for finding mmc devices on i.MX6Q icore boards added in below comment "icorem6: Fix to find MMC devices" (sha1: a2b137b38d925df91afef52f5122927de024f81a) which is reverted in during u-boot-imx merge " Merge git://git.denx.de/u-boot-imx" (sha1: 6aee2ab68c362ace5a59f89a63abed82e0bf19e5) This patch, is recreated to fix merge conflict. Signed-off-by: Jagan Teki <jagan@amarulasolutions.com> --- Changes for v2: - None configs/imx6qdl_icore_mmc_defconfig | 1 - configs/imx6qdl_icore_rqs_defconfig | 1 - 2 files changed, 2 deletions(-)