From patchwork Tue Aug 29 06:41:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 111191 Delivered-To: patch@linaro.org Received: by 10.140.95.112 with SMTP id h103csp897407qge; Mon, 28 Aug 2017 23:51:09 -0700 (PDT) X-Received: by 10.80.192.70 with SMTP id u6mr2640785edd.165.1503989469813; Mon, 28 Aug 2017 23:51:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503989469; cv=none; d=google.com; s=arc-20160816; b=AJUotaA1xq4J3hG9/Kf2ZpWl1+rHKoaufcBD3ydHwGW1s+SErSa+Fd2b7wLxJRZD80 l4GtgPvz6D1TLpW4GEYNBIYa4EBIWkUvEOXuazZ3FK3YE2lYeEaKu22MA6y6d2PZe30t Dn0vqID33qbAyRDK6r5+6TYQqq9zGp1EhOv/8gilWZ4fAoToh5pKpcfdqds2tW6u6PPB bgjYzt12CAKn2GJmYbT1snPQpXBa08UPyNQXsAs5SvGkpJfsD0EGIvjfsBRXfjFSOXhe tzFjpjn8lfvlOMv9iKAC4Hmv+VAfsX4tuF+vly7p2wSKlOrMACZYVcmmFBdk7dSuO8Qe pNZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:message-id:date:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=+ForgnddCwge3hqJkTwEC2iVAvgtAlQS2YQ1TfU9Et4=; b=vpF45Y6BH8ziffjSKxkfDVul+/53ggQRZt99PPFXIR7nreOxxHheGOYfrsePIeoPsO oQvzBSVaDWWlhfg73V0Pl+5JaStmydhiCqP8hrJz995QvoL+qG+G6wxphjQUaGzbFd2Q IlGPLfu4NYncG/Gdm99vUWIzpOb8D+LdmxT+1YWGU9C+UfQDZaQWNh4giFP/X0egk27f 6Aby6FuUcJXCMltQK+9nuDgf9tH2PH2cqeuMiObustUAQBtvceShfi1oNThe8bWN+MQb +upGcPPOsRwo65r2CALCoflTcG4/nuj29yeOI5sWKSpMMgsjjgf0dWwID2vYcdcC4Ji2 kssw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=mUFANysn; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Return-Path: Received: from lists.denx.de (dione.denx.de. [81.169.180.215]) by mx.google.com with ESMTP id r21si1872771edc.213.2017.08.28.23.51.09; Mon, 28 Aug 2017 23:51:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) client-ip=81.169.180.215; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=mUFANysn; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 81.169.180.215 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by lists.denx.de (Postfix, from userid 105) id C58A9C21FAC; Tue, 29 Aug 2017 06:47:22 +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=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 7D84CC22347; Tue, 29 Aug 2017 06:47:17 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 1AD64C2209C; Tue, 29 Aug 2017 06:41:57 +0000 (UTC) Received: from conuserg-09.nifty.com (conuserg-09.nifty.com [210.131.2.76]) by lists.denx.de (Postfix) with ESMTPS id 4BBF5C2211D for ; Tue, 29 Aug 2017 06:41:56 +0000 (UTC) Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id v7T6fY2E022849; Tue, 29 Aug 2017 15:41:34 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com v7T6fY2E022849 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1503988894; bh=B5ZbJIbtZTHteGa77iT8QuQ6gJDSXg0LgCyXYEsn6Wo=; h=From:To:Cc:Subject:Date:From; b=mUFANysn8EoJFNW2tLrDbCrVmotE3oZEOKPA+XYIHgyoAzBoAz1OPdCkSiCUICTUF gFd+zJsArqKXT4yi5dHCsr+uhQbTMp3aaCbb5c5cljKHxkP8UXOO9KKFB5h15I/lo2 9Q/290/RNwbU0aXGQiP2wy2Dv0ueVB0eKCjkd+8EbwYwlpM3PaWjufYR9HIhwkce0F M12bSczYq86CclHPPRAg1IHPGXpAF1NNtoXprO+XG0/xwW2VOYtVRflbJArGJGeftq HOCOzU0D8GfDzFScRnqKXVvO9wAS56lPVsTY22T7WF84Y6w0ObVpVVCGCPem+ZUaU0 8WpMbX1mokYwA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Tue, 29 Aug 2017 15:41:32 +0900 Message-Id: <1503988892-20450-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Cc: Albert Aribaud Subject: [U-Boot] [PATCH] ARM: uniphier: move CONFIG_NAND to defconfig 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" This imply was added when the option was moved by the moveconfig tool, but the intention is not clear. Move it to defconfig. Signed-off-by: Masahiro Yamada --- arch/arm/mach-uniphier/Kconfig | 1 - configs/uniphier_ld4_sld8_defconfig | 1 + configs/uniphier_pro4_defconfig | 1 + configs/uniphier_pxs2_ld6b_defconfig | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig index 6a7e239e0d28..ee2211241235 100644 --- a/arch/arm/mach-uniphier/Kconfig +++ b/arch/arm/mach-uniphier/Kconfig @@ -9,7 +9,6 @@ config ARCH_UNIPHIER_32BIT select CPU_V7_HAS_NONSEC select ARMV7_NONSEC select ARCH_SUPPORT_PSCI - imply NAND choice prompt "UniPhier SoC select" diff --git a/configs/uniphier_ld4_sld8_defconfig b/configs/uniphier_ld4_sld8_defconfig index be0ae70f1a89..9c185e612b83 100644 --- a/configs/uniphier_ld4_sld8_defconfig +++ b/configs/uniphier_ld4_sld8_defconfig @@ -36,6 +36,7 @@ CONFIG_GPIO_UNIPHIER=y CONFIG_MISC=y CONFIG_I2C_EEPROM=y CONFIG_MMC_UNIPHIER=y +CONFIG_NAND=y CONFIG_NAND_DENALI=y CONFIG_SYS_NAND_DENALI_64BIT=y CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 diff --git a/configs/uniphier_pro4_defconfig b/configs/uniphier_pro4_defconfig index 5ba8879af6ae..cdc4809bed6a 100644 --- a/configs/uniphier_pro4_defconfig +++ b/configs/uniphier_pro4_defconfig @@ -35,6 +35,7 @@ CONFIG_GPIO_UNIPHIER=y CONFIG_MISC=y CONFIG_I2C_EEPROM=y CONFIG_MMC_UNIPHIER=y +CONFIG_NAND=y CONFIG_NAND_DENALI=y CONFIG_SYS_NAND_DENALI_64BIT=y CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8 diff --git a/configs/uniphier_pxs2_ld6b_defconfig b/configs/uniphier_pxs2_ld6b_defconfig index 22c21548b6d7..b487b9dba49f 100644 --- a/configs/uniphier_pxs2_ld6b_defconfig +++ b/configs/uniphier_pxs2_ld6b_defconfig @@ -36,6 +36,7 @@ CONFIG_GPIO_UNIPHIER=y CONFIG_MISC=y CONFIG_I2C_EEPROM=y CONFIG_MMC_UNIPHIER=y +CONFIG_NAND=y CONFIG_NAND_DENALI=y CONFIG_SYS_NAND_DENALI_64BIT=y CONFIG_NAND_DENALI_SPARE_AREA_SKIP_BYTES=8