[U-Boot] [PATCH v2 1/2] icore: configs: Fix merge conflict issue
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
Instead of changing mmc devno from dts nodes better to return the detected devno so-that env trigger the same.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com --- Changes for v2: - None
board/engicam/icorem6_rqs/icorem6_rqs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/board/engicam/icorem6_rqs/icorem6_rqs.c b/board/engicam/icorem6_rqs/icorem6_rqs.c index 2a321dc..0114889 100644 --- a/board/engicam/icorem6_rqs/icorem6_rqs.c +++ b/board/engicam/icorem6_rqs/icorem6_rqs.c @@ -27,8 +27,7 @@ DECLARE_GLOBAL_DATA_PTR; #ifdef CONFIG_ENV_IS_IN_MMC int board_mmc_get_env_dev(int devno) { - /* dev 0 for SD/eSD, dev 1 for MMC/eMMC */ - return (devno == 3) ? 1 : 0; + return devno; } #endif
On 12/10/2017 16:44, Jagan Teki wrote:
Instead of changing mmc devno from dts nodes better to return the detected devno so-that env trigger the same.
Signed-off-by: Jagan Teki jagan@amarulasolutions.com
Changes for v2:
- None
board/engicam/icorem6_rqs/icorem6_rqs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/board/engicam/icorem6_rqs/icorem6_rqs.c b/board/engicam/icorem6_rqs/icorem6_rqs.c index 2a321dc..0114889 100644 --- a/board/engicam/icorem6_rqs/icorem6_rqs.c +++ b/board/engicam/icorem6_rqs/icorem6_rqs.c @@ -27,8 +27,7 @@ DECLARE_GLOBAL_DATA_PTR; #ifdef CONFIG_ENV_IS_IN_MMC int board_mmc_get_env_dev(int devno) {
- /* dev 0 for SD/eSD, dev 1 for MMC/eMMC */
- return (devno == 3) ? 1 : 0;
- return devno;
} #endif
Reviewed-by: Stefano Babic sbabic@denx.de
Best regards, Stefano Babic
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
participants (2)
-
Jagan Teki -
Stefano Babic