From patchwork Mon Sep 19 12:26:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 76535 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp933808qgf; Mon, 19 Sep 2016 05:26:58 -0700 (PDT) X-Received: by 10.194.5.202 with SMTP id u10mr26612938wju.149.1474288017931; Mon, 19 Sep 2016 05:26:57 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id m11si5212233wmf.90.2016.09.19.05.26.57; Mon, 19 Sep 2016 05:26:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4625E4B811; Mon, 19 Sep 2016 14:26:56 +0200 (CEST) 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 HhoFRUf5CRbW; Mon, 19 Sep 2016 14:26:56 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B8AC14B656; Mon, 19 Sep 2016 14:26:55 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E77A64B656 for ; Mon, 19 Sep 2016 14:26:50 +0200 (CEST) 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 Ot6S2NXj0NZT for ; Mon, 19 Sep 2016 14:26:50 +0200 (CEST) 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 conuserg-08.nifty.com (conuserg-08.nifty.com [210.131.2.75]) by theia.denx.de (Postfix) with ESMTPS id 34FFA4B624 for ; Mon, 19 Sep 2016 14:26:46 +0200 (CEST) Received: from grover.sesame (FL1-111-169-71-157.osk.mesh.ad.jp [111.169.71.157]) (authenticated) by conuserg-08.nifty.com with ESMTP id u8JCQd5K017366; Mon, 19 Sep 2016 21:26:41 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com u8JCQd5K017366 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1474288002; bh=uM4gBUY3PbifRBPp2BantHQ+QHlfcxJX7k22ro9uzUg=; h=From:To:Cc:Subject:Date:From; b=Drvdumqs/ssnNtMM+o1mdKD3wjDICH4TvqrgVUAYC/Qlrqgp+5qdsvEe8UuibHRzl lUEqURHBGGI/bpDfZwLQgiNPt6TFBzRRi07Dl3jhhp6gqqBP82rN7Cv4u/KNMFyFGy yXD1j+sdbbdI5zwr9IXReCyHvnq7iqrQtRRu7/JbSoSXJC7rbwvORSEJuVa9N1Bq88 Crr7Yi9vRZ8tTYbKoJvUhsgDtvxSMueuWRY4GD8T+AqTTU0zjF5aBWDhiwWQMfz8pq BnPfg3p7yl9FLXre6YNmwcg+4PkjUggYxV7EsbWFlIik0F8L/7CpFnoCRJ7bqV2UaD v7kxxbN6PgMIQ== X-Nifty-SrcIP: [111.169.71.157] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Mon, 19 Sep 2016 21:26:38 +0900 Message-Id: <1474287998-21915-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 Subject: [U-Boot] [PATCH] ARM: uniphier: move CONFIG_SPL_* to defconfig or select 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" As I repeated in the ML, I am unhappy with config entries with bare defaults. Kick them out of arch/arm/mach-uniphier/Kconfig. Currently, CONFIG_SPL_SERIAL_SUPPORT is not user-configurable (build fails without it), but it should be fixed later anyway, so I am moving CONFIG_SPL_SERIAL_SUPPORT to defconfigs. Signed-off-by: Masahiro Yamada --- arch/arm/Kconfig | 2 ++ arch/arm/mach-uniphier/Kconfig | 15 --------------- configs/uniphier_ld11_defconfig | 1 + configs/uniphier_ld20_defconfig | 1 + configs/uniphier_ld4_sld8_defconfig | 3 +++ configs/uniphier_pro4_defconfig | 3 +++ configs/uniphier_pxs2_ld6b_defconfig | 3 +++ configs/uniphier_sld3_defconfig | 3 +++ 8 files changed, 16 insertions(+), 15 deletions(-) -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a311215..5de3bfc 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -868,6 +868,8 @@ config ARCH_UNIPHIER select PINCTRL select SPL select SPL_DM + select SPL_LIBCOMMON_SUPPORT + select SPL_LIBGENERIC_SUPPORT select SPL_OF_CONTROL select SPL_PINCTRL select SUPPORT_SPL diff --git a/arch/arm/mach-uniphier/Kconfig b/arch/arm/mach-uniphier/Kconfig index 2e824bb..7bee6c7 100644 --- a/arch/arm/mach-uniphier/Kconfig +++ b/arch/arm/mach-uniphier/Kconfig @@ -1,20 +1,5 @@ if ARCH_UNIPHIER -config SPL_LIBCOMMON_SUPPORT - default y - -config SPL_LIBGENERIC_SUPPORT - default y - -config SPL_MMC_SUPPORT - default y if !ARCH_UNIPHIER_64BIT - -config SPL_NAND_SUPPORT - default y if !ARM64 - -config SPL_SERIAL_SUPPORT - default y - config SYS_CONFIG_NAME default "uniphier" diff --git a/configs/uniphier_ld11_defconfig b/configs/uniphier_ld11_defconfig index 6b27e71..cd9918f 100644 --- a/configs/uniphier_ld11_defconfig +++ b/configs/uniphier_ld11_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_UNIPHIER=y +CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_ARCH_UNIPHIER_LD11=y CONFIG_MICRO_SUPPORT_CARD=y CONFIG_SYS_TEXT_BASE=0x84000000 diff --git a/configs/uniphier_ld20_defconfig b/configs/uniphier_ld20_defconfig index 3c0313e..564258d 100644 --- a/configs/uniphier_ld20_defconfig +++ b/configs/uniphier_ld20_defconfig @@ -1,5 +1,6 @@ CONFIG_ARM=y CONFIG_ARCH_UNIPHIER=y +CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_ARCH_UNIPHIER_LD20=y CONFIG_MICRO_SUPPORT_CARD=y CONFIG_SYS_TEXT_BASE=0x84000000 diff --git a/configs/uniphier_ld4_sld8_defconfig b/configs/uniphier_ld4_sld8_defconfig index 4e2f401..dbff719 100644 --- a/configs/uniphier_ld4_sld8_defconfig +++ b/configs/uniphier_ld4_sld8_defconfig @@ -1,5 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_UNIPHIER=y +CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_NAND_SUPPORT=y +CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_ARCH_UNIPHIER_LD4_SLD8=y CONFIG_MICRO_SUPPORT_CARD=y CONFIG_SYS_TEXT_BASE=0x84000000 diff --git a/configs/uniphier_pro4_defconfig b/configs/uniphier_pro4_defconfig index 6bfb6da..75287cf 100644 --- a/configs/uniphier_pro4_defconfig +++ b/configs/uniphier_pro4_defconfig @@ -1,5 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_UNIPHIER=y +CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_NAND_SUPPORT=y +CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_MICRO_SUPPORT_CARD=y CONFIG_SYS_TEXT_BASE=0x84000000 CONFIG_DEFAULT_DEVICE_TREE="uniphier-ph1-pro4-ref" diff --git a/configs/uniphier_pxs2_ld6b_defconfig b/configs/uniphier_pxs2_ld6b_defconfig index f88350e..f0d3420 100644 --- a/configs/uniphier_pxs2_ld6b_defconfig +++ b/configs/uniphier_pxs2_ld6b_defconfig @@ -1,5 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_UNIPHIER=y +CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_NAND_SUPPORT=y +CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_ARCH_UNIPHIER_PRO5_PXS2_LD6B=y CONFIG_MICRO_SUPPORT_CARD=y CONFIG_SYS_TEXT_BASE=0x84000000 diff --git a/configs/uniphier_sld3_defconfig b/configs/uniphier_sld3_defconfig index 26f3663..91d5226 100644 --- a/configs/uniphier_sld3_defconfig +++ b/configs/uniphier_sld3_defconfig @@ -1,5 +1,8 @@ CONFIG_ARM=y CONFIG_ARCH_UNIPHIER=y +CONFIG_SPL_MMC_SUPPORT=y +CONFIG_SPL_NAND_SUPPORT=y +CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_ARCH_UNIPHIER_SLD3=y CONFIG_MICRO_SUPPORT_CARD=y CONFIG_SYS_TEXT_BASE=0x84000000