From patchwork Fri Jun 13 16:01:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 4350291 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 B40C39F3B4 for ; Fri, 13 Jun 2014 16:02:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B25F220222 for ; Fri, 13 Jun 2014 16:02:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5E19D2022A for ; Fri, 13 Jun 2014 16:02:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753090AbaFMQCI (ORCPT ); Fri, 13 Jun 2014 12:02:08 -0400 Received: from mout.kundenserver.de ([212.227.126.187]:63767 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752952AbaFMQCH (ORCPT ); Fri, 13 Jun 2014 12:02:07 -0400 Received: from wuerfel.lan (HSI-KBW-134-3-133-35.hsi14.kabel-badenwuerttemberg.de [134.3.133.35]) by mrelayeu.kundenserver.de (node=mreue007) with ESMTP (Nemesis) id 0M9AGP-1X2syt0yTt-00CRJV; Fri, 13 Jun 2014 18:01:30 +0200 From: Arnd Bergmann To: linux-arm-kernel@lists.infradead.org Cc: arm@kernel.org, Rob Herring , Ben Dooks , Kukjin Kim , linux-samsung-soc@vger.kernel.org, Arnd Bergmann Subject: [PATCH 11/14] ARM: exynos: cleanup kconfig option display Date: Fri, 13 Jun 2014 18:01:13 +0200 Message-Id: <1402675276-538682-12-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1402675276-538682-1-git-send-email-arnd@arndb.de> References: <1402675276-538682-1-git-send-email-arnd@arndb.de> X-Provags-ID: V02:K0:tAbreLB8RkHCzyCUvVS/3ctxPMXXa5GYjPBkas2GbBb 8Rj6+yeiIvX1J+qUg6tJU2CFZJ1XcaKlEeTgufLxBs+5sNABLY VOCyRljnNFv09cRxerjWGACaFpscUiYvBOUfK/i+DfTm16SFbZ uPfzWZIRhWtSulE/5TShUaKziBZ97FXuUkfzFGdm2xcyIttkMZ nrtjedWY4RFh41EW37KrSqHiX8j0CykZ07FdGxlDWxjo6WM0Pc NcnsH4VYey93Iyt50L6l2JAaWTc+bqgQbFF3nYCt1PddCGeJqu EAW0cwMxdpqXBZ2iBxHr8nx0AeJ+Ii8ND2f/3xUN2o3GvE4UpI CHEsRxGZUS4hFmbHmXZV5ZWrVbSd4T7+E9nIq2MUQ 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.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Signed-off-by: Arnd Bergmann --- 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 9b8f528..245058b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -994,8 +994,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" @@ -1013,6 +1011,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 91911e4..301b892 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, @@ -502,4 +490,5 @@ config DEBUG_S3C_UART default "2" if DEBUG_S3C_UART2 default "3" if DEBUG_S3C_UART3 +endmenu endif