From patchwork Sun Dec 6 16:57:31 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 553156 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 462491402BB for ; Mon, 7 Dec 2015 03:58:05 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b=E8WO1xvl; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A73484B6B3; Sun, 6 Dec 2015 17:58:00 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z8GnIyih72pE; Sun, 6 Dec 2015 17:58:00 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9F8604B6AD; Sun, 6 Dec 2015 17:57:51 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 21EE44B67F for ; Sun, 6 Dec 2015 17:57:44 +0100 (CET) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TtSy7iG7fudy for ; Sun, 6 Dec 2015 17:57:44 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-ob0-f182.google.com (mail-ob0-f182.google.com [209.85.214.182]) by theia.denx.de (Postfix) with ESMTPS id AB6AE4B67D for ; Sun, 6 Dec 2015 17:57:39 +0100 (CET) Received: by obbnk6 with SMTP id nk6so101586499obb.2 for ; Sun, 06 Dec 2015 08:57:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=sender:from:to:cc:subject:date:message-id; bh=AIwC/TVIv0cpLDHU7hu/IdtSN+qjxudtDB/dXKeD3b0=; b=E8WO1xvlOi/fBAxiOZrB4z8w8vr5NCc+SpUukPt9+pXe+FuYECerAgU+MCqDwm1gm8 z01xSVnGVBQQpw4cf7yAajEeTUyGFP01SGwFDJOZ8GtguFS2FHJHsKQiUz32rQ1HYtao KV6e+SFMKr6roDk6z6QQGmkV+OO6CDF+MVPlF1X/6anVH3KlKD243yWCPPGwxehU0dXc oU8IOYsuVgwtmSBbNC/ijsWNFvktfyzqOQ0icZm43vfVXVWsenYEjUhmbS6WqvGxr7mV /+Kv1nN8Fr22yTjUoFbV+MX1atWR1BKzmmXEOIT+dpLPF7GGVmRTUxEe0EfdPYtiXMqZ svtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=AIwC/TVIv0cpLDHU7hu/IdtSN+qjxudtDB/dXKeD3b0=; b=Bob1cMaI5fWXr56fU3kbJ5fZqiF3LMz5CeFLPPxNpiLI+ZyfrsGURV0/YPJp0/ra23 EJe+aatizaOhHH3tn/xxOzw5a0CqVhMMR5b+lfr3v2sP5Qybmozg9zqaMf4PqKGlNP1E 47i578lTqdhRAJXDvTd7B+Nvh0+NcriuLdV3/Z8yZGI74NapLXV8w6HimkhIndSieC1G e8vkntDOuNYAju1SHMn+IhrkrQBXUosF7wAVY5sQO6mSlJql+2vDOy+DouXP/xm3SEZ4 Rnq3ABqnSSuOlK/Ms2H2DmO99Nb6KnxvgoHdk0nlVKUQHJR4+Pq1Lxts1bXFn/pgb5jg G89A== X-Gm-Message-State: ALoCoQmkcy5WWFuWdMIz9StXlVj2tsTFgfnAEvh+UAv2NFkWTxHwdzcLkTNrz3DCN4CSV1iSWnGo X-Received: by 10.60.174.201 with SMTP id bu9mr11766202oec.11.1449421058717; Sun, 06 Dec 2015 08:57:38 -0800 (PST) Received: from kaki.bld.corp.google.com ([2620:0:1005:1100:3cd4:eb8e:35ed:d380]) by smtp.gmail.com with ESMTPSA id of1sm9981712obb.18.2015.12.06.08.57.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 Dec 2015 08:57:37 -0800 (PST) Received: by kaki.bld.corp.google.com (Postfix, from userid 121222) id 95733220A48; Sun, 6 Dec 2015 09:57:36 -0700 (MST) From: Simon Glass To: U-Boot Mailing List Date: Sun, 6 Dec 2015 09:57:31 -0700 Message-Id: <1449421054-16359-1-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0 Cc: Tom Rini , Stephen Warren , Tom Warren Subject: [U-Boot] [PATCH v2 1/4] tegra: Remove merge markers in some Kconfig files X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" These were added by mistake in commit fde7e189. They cause a warning when configuring the boards. Remove them. Signed-off-by: Simon Glass Reported-by: Stephen Warren Reported-by: Kevin Hilman Tested-by: Stephen Warren Fixes: fde7e18938d8 ("dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig") --- Changes in v2: - Add 'Fixes' tag configs/beaver_defconfig | 3 --- configs/cardhu_defconfig | 3 --- configs/jetson-tk1_defconfig | 3 --- configs/trimslice_defconfig | 3 --- 4 files changed, 12 deletions(-) diff --git a/configs/beaver_defconfig b/configs/beaver_defconfig index 2930344..8add08d 100644 --- a/configs/beaver_defconfig +++ b/configs/beaver_defconfig @@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y -<<<<<<< HEAD CONFIG_SPI_FLASH_WINBOND=y -======= CONFIG_PCI_TEGRA=y ->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig CONFIG_SYS_NS16550=y CONFIG_TEGRA20_SLINK=y CONFIG_USB=y diff --git a/configs/cardhu_defconfig b/configs/cardhu_defconfig index 5760018..c9f565a 100644 --- a/configs/cardhu_defconfig +++ b/configs/cardhu_defconfig @@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y -<<<<<<< HEAD CONFIG_SPI_FLASH_WINBOND=y -======= CONFIG_PCI_TEGRA=y ->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig CONFIG_SYS_NS16550=y CONFIG_TEGRA20_SLINK=y CONFIG_USB=y diff --git a/configs/jetson-tk1_defconfig b/configs/jetson-tk1_defconfig index 9500d2c..efc4aee 100644 --- a/configs/jetson-tk1_defconfig +++ b/configs/jetson-tk1_defconfig @@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y -<<<<<<< HEAD CONFIG_SPI_FLASH_WINBOND=y -======= CONFIG_PCI_TEGRA=y ->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig CONFIG_SYS_NS16550=y CONFIG_TEGRA114_SPI=y CONFIG_USB=y diff --git a/configs/trimslice_defconfig b/configs/trimslice_defconfig index ee40218..e34faa3 100644 --- a/configs/trimslice_defconfig +++ b/configs/trimslice_defconfig @@ -13,11 +13,8 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set # CONFIG_CMD_NFS is not set CONFIG_SPI_FLASH=y -<<<<<<< HEAD CONFIG_SPI_FLASH_WINBOND=y -======= CONFIG_PCI_TEGRA=y ->>>>>>> dm: tegra: pci: Move CONFIG_PCI_TEGRA to Kconfig CONFIG_SYS_NS16550=y CONFIG_TEGRA20_SFLASH=y CONFIG_USB=y