From patchwork Tue Jun 10 14:06:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 4329101 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id DC22F9F3B4 for ; Tue, 10 Jun 2014 14:06:24 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 041B7201F5 for ; Tue, 10 Jun 2014 14:06:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 296E6202BE for ; Tue, 10 Jun 2014 14:06:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752524AbaFJOGV (ORCPT ); Tue, 10 Jun 2014 10:06:21 -0400 Received: from mail-oa0-f51.google.com ([209.85.219.51]:40569 "EHLO mail-oa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752516AbaFJOGV (ORCPT ); Tue, 10 Jun 2014 10:06:21 -0400 Received: by mail-oa0-f51.google.com with SMTP id j17so4001972oag.38 for ; Tue, 10 Jun 2014 07:06:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=/5GTxpxcA0VzQ3TCb+81UI2/Po2liNHT3Ii8UjKRyH8=; b=CJYgIcxv9QXcp35G0wNPCxlM/PclPyfL13z4lK+lOnj4gZJvYjuzMb3WOL114uhp4A 1ddgidjCjhmA2SiYOhZHz4Qjf8D5CCGPNkbv4bsKmNNMl0JKqtB61nyzr5N4kfsFyjPo U2qTaBkBI8kxGJ5a9TzRLi3m4weX/rlXySGX/aMpUMGiH6zBHmWuooKuTh1ba38Idcrp QyBr5QqaHp5qiNOUWPZb6VwDFylHbKcug3WlGpL57mawGl9Gk2cE2jpfXCNdB1/pNqwt jQTbeCQ6Mtl6Fdcz+hJsOYDY+7bXRU/p4baBtXgwdYvc2azqIMYZ9DHBHU9yIRSbHCWP t3tg== X-Received: by 10.60.94.231 with SMTP id df7mr33174189oeb.26.1402409180542; Tue, 10 Jun 2014 07:06:20 -0700 (PDT) Received: from localhost.localdomain (66-90-144-10.dyn.grandenetworks.net. [66.90.144.10]) by mx.google.com with ESMTPSA id tk2sm80446942oeb.2.2014.06.10.07.06.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 Jun 2014 07:06:19 -0700 (PDT) From: Rob Herring To: arm@kernel.org Cc: linux-arm-kernel@lists.infradead.org, Ben Dooks , Kukjin Kim , Rob Herring , linux-samsung-soc@vger.kernel.org Subject: [PATCH 1/2] ARM: exynos: cleanup kconfig option display Date: Tue, 10 Jun 2014 09:06:09 -0500 Message-Id: <1402409170-1314-2-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1402409170-1314-1-git-send-email-robherring2@gmail.com> References: <1402409170-1314-1-git-send-email-robherring2@gmail.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Rob Herring The addition of Exynos to multi-platform configs creates a mess of config options with options appearing before the Exynos config option. This is due to arch/arm/plat-samsung/Kconfig being included out of order with the other Samsung platform kconfig files. Reorder the kconfig files and move all the options into a sub-menu. Some of the options are dead, so remove those as well. Signed-off-by: Rob Herring Cc: Ben Dooks Cc: Kukjin Kim Cc: linux-samsung-soc@vger.kernel.org Acked-by: Kukjin Kim --- arch/arm/Kconfig | 3 +-- arch/arm/plat-samsung/Kconfig | 17 +++-------------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 87b63fd..cbf0c37 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1009,8 +1009,6 @@ source "arch/arm/mach-rockchip/Kconfig" source "arch/arm/mach-sa1100/Kconfig" -source "arch/arm/plat-samsung/Kconfig" - source "arch/arm/mach-socfpga/Kconfig" source "arch/arm/mach-spear/Kconfig" @@ -1028,6 +1026,7 @@ source "arch/arm/mach-s5pc100/Kconfig" source "arch/arm/mach-s5pv210/Kconfig" source "arch/arm/mach-exynos/Kconfig" +source "arch/arm/plat-samsung/Kconfig" source "arch/arm/mach-shmobile/Kconfig" diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig index 243dfcb..ac032cd 100644 --- a/arch/arm/plat-samsung/Kconfig +++ b/arch/arm/plat-samsung/Kconfig @@ -35,27 +35,15 @@ config SAMSUNG_PM Base platform power management code for samsung code if PLAT_SAMSUNG +menu "Samsung Common options" # boot configurations comment "Boot options" -config S3C_BOOT_ERROR_RESET - bool "S3C Reboot on decompression error" - help - Say y here to use the watchdog to reset the system if the - kernel decompressor detects an error during decompression. - -config S3C_BOOT_UART_FORCE_FIFO - bool "Force UART FIFO on during boot process" - default y - help - Say Y here to force the UART FIFOs on during the kernel - uncompressor - - config S3C_LOWLEVEL_UART_PORT int "S3C UART to use for low-level messages" + depends on ARCH_S3C64XX default 0 help Choice of which UART port to use for the low-level messages, @@ -503,4 +491,5 @@ config DEBUG_S3C_UART default "2" if DEBUG_S3C_UART2 default "3" if DEBUG_S3C_UART3 +endmenu endif