From patchwork Thu Oct 12 14:44:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 824903 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Lb3uu48P"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3yCYXg2FKgz9t2l for ; Fri, 13 Oct 2017 01:44:51 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 0B683C21F0F; Thu, 12 Oct 2017 14:44:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id A650BC21D82; Thu, 12 Oct 2017 14:44:44 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 9D43BC21D82; Thu, 12 Oct 2017 14:44:43 +0000 (UTC) Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by lists.denx.de (Postfix) with ESMTPS id 3AC49C21D72 for ; Thu, 12 Oct 2017 14:44:43 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id 131so4125075wmk.3 for ; Thu, 12 Oct 2017 07:44:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=oqAPNj0vGYuqVmtDKS5PSyqQgZBnmr95LPErs5qeV8A=; b=Lb3uu48PQ0G03JVsgX2nN4xZb2ls1LlQAU8DGnuMkDJbx3ms5jDMTkVgbYOs2ltZft 6adXXyR8c41CR5rY6WzgtxvtrIg7JgRkk+9JX3jWIuBUO+PLaXL1XpFulvDDGxVrE+SX GF4StAtSEsflyoRUJmtwbuxeBCa57OH2llKWqIqcAR0p/Q//eWg8GUHUA7pJH8Q/WweM 2oAebpGtWS1K5G9LV5IJRdzSsROX+rOloliJ9YjwTILD2QUUA7z9OjfkpVDrnlxaK83A n8d27yrUP9+PtGKv2C5NMmPKfCrdsZG1NCad4wDCfY1//8mnuGz2a/9DVgKJwAAL44D2 hUWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=oqAPNj0vGYuqVmtDKS5PSyqQgZBnmr95LPErs5qeV8A=; b=Mrsv0Wr49wj30ABpw0zFfDjnVsniusErHb4p35FHeqLrKVgQqoV22CI6n/18sKCIQC YJMWREr774SoULJaNUr2nBIQzN/Waaz/2ofaC4j/9WfGCzErvYjrzK4y8e3Wn8Pcsiby SwGh+k1Lg2k69l5MsDQuHohn07MOGUfue5XvGM1u97lBLiXfu+bSc2ZODnVuLd64afMh KQRxyJmKuOADW1LejM9dRNLd6fFcvJGAoqcLyLiVe2KdqYz0YhTW3PTrwKu5ETD53ZJq /dWw0dU2T1K7cCJUxvWf/1i2Bi3T7tBLeE75xdQDzRD2iJF5yKSJJ7w8yuQ1LG9vTjZ3 9hig== X-Gm-Message-State: AMCzsaW9rR1Ihyj3Fd4wXvGsn+svYwE2iqSJLhBMF6yYqrHYom0N9WO7 XWItmU2HJZycPbzCW3HAHr8= X-Google-Smtp-Source: AOwi7QDq8pRcKQNgJsar3f5FxTdQvQ8A38gYb5NHNNUokXCz4gqBWcyyUOowoic3mWQYYpwFrEQ4bQ== X-Received: by 10.223.133.186 with SMTP id 55mr2484481wrt.17.1507819482626; Thu, 12 Oct 2017 07:44:42 -0700 (PDT) Received: from localhost.localdomain ([5.170.96.47]) by smtp.gmail.com with ESMTPSA id z192sm452280wmz.28.2017.10.12.07.44.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 12 Oct 2017 07:44:41 -0700 (PDT) From: Jagan Teki X-Google-Original-From: Jagan Teki To: Stefano Babic Date: Thu, 12 Oct 2017 20:14:23 +0530 Message-Id: <1507819464-24321-1-git-send-email-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 Cc: Fabio Estevam , u-boot@lists.denx.de, Tom Rini Subject: [U-Boot] [PATCH v2 1/2] icore: configs: Fix merge conflict issue X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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 Reviewed-by: Stefano Babic --- 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