From patchwork Tue Mar 14 18:30:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Filippov X-Patchwork-Id: 738871 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vjNd648W9z9s1h for ; Wed, 15 Mar 2017 05:32:26 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="WXwhPF33"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 184CF889FC; Tue, 14 Mar 2017 18:32:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id O_0zVW1hEH5E; Tue, 14 Mar 2017 18:32:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1BDBB889A9; Tue, 14 Mar 2017 18:32:07 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 96B8C1BFCC3 for ; Tue, 14 Mar 2017 18:31:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9510330BB5 for ; Tue, 14 Mar 2017 18:31:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xx9auXtbmT6O for ; Tue, 14 Mar 2017 18:31:39 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by silver.osuosl.org (Postfix) with ESMTPS id B2A6430BB1 for ; Tue, 14 Mar 2017 18:31:39 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id 67so20139415pfg.2 for ; Tue, 14 Mar 2017 11:31:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=7DLyCpR0cE8kTyCu7tfsWZeXJ3Gk/srI6prbDLxu3mI=; b=WXwhPF33s0hVi4m6WgwBDx+ruWWS+iqYMX7hmTTnM4XjQDsytqaga41rn6qPc+1/6A 0RFd3cNwMRvHRyZ9bhALhA0Y3NR5HK2eFn9h2Mg5UGEemgTig2cnjkZzX4FT/A0eywdm 2iGh1SBHhW29lWHXX0UyS5ybXP7FyWdHywrCVBRJiXUyFD1JziHaUgyd9czMnOdMgCtJ Kng0zC6hKP3gMN8WWh8rhcAesw4CITHsVaBLAZ3aFuVl8IqwN2DdlNN9FqJt64S1Wvt8 45U1xDCSzdu8XYRRifM2AoZCIANPnb4u3zSSqPlkp+CQUjDUc5J5fr6pCbh1ZsSPW8v6 KMQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7DLyCpR0cE8kTyCu7tfsWZeXJ3Gk/srI6prbDLxu3mI=; b=ijxdFl1tO5mOlD03pDoNCjgFWpQhTs2BrVj/buVQO6ghWeCyVJZ2pEVSKMCIAr2e1z PgYYEUkKHhX8HzSjXDviwjguEXRSPQY6tr3hIu+YtK/6qzBHmIOnf8C3wJTz1h7W9lMU +ac/qaOQ6KsWaZ9eqeCo0r+O0dXB2kR7gPkE76C4NaDSqOg+KvuROJKsHth3y35Gk/FE Kz7DyVigLIzXA+9e/2EwcjuIH0qiWakgHb/9AzuKIwn/tQ4JIjnMuuTAD6abkOYASEe7 KEOHJQVAB49EwV8ybGtLD4/pePMrckLuDfb0silq8kYufO1brpC+Aujjobnz16E0J8n2 iUNg== X-Gm-Message-State: AMke39ncNRmWlt5zMuSqlaBc3GH9khRGgc0WIAj/4LnkTu8nphvDmkSmmLxEhA5LEs6tDg== X-Received: by 10.84.232.1 with SMTP id h1mr57419927plk.95.1489516299380; Tue, 14 Mar 2017 11:31:39 -0700 (PDT) Received: from octofox.metropolis (corp.Cadence.COM. [158.140.1.28]) by smtp.gmail.com with ESMTPSA id e13sm40192470pgn.38.2017.03.14.11.31.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 14 Mar 2017 11:31:38 -0700 (PDT) From: Max Filippov To: buildroot@uclibc.org Date: Tue, 14 Mar 2017 11:30:45 -0700 Message-Id: <1489516252-3803-17-git-send-email-jcmvbkbc@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1489516252-3803-1-git-send-email-jcmvbkbc@gmail.com> References: <1489516252-3803-1-git-send-email-jcmvbkbc@gmail.com> Cc: Thomas Petazzoni , "Yann E. MORIN" Subject: [Buildroot] [PATCH 16/23] arch/xtensa: get rid of an intermediate blind kconfig option X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: "Yann E. MORIN" It is not needed to have an intermediate blind option, we can just hide the prompt behind the same dependency as the non-blind symbol. Update our qemu-xtensa defconfig acordingly (note: it was using different values for both options, which is not possible; the blind option was just set to the non-blind one in the .config). Also remove an unneeded empty default for the BR2_XTENSA_OVERLAY_DIR string option (strings are empty by default). Signed-off-by: "Yann E. MORIN" Cc: Gustavo Zacarias Signed-off-by: Max Filippov --- Config.in.legacy | 11 +++++++++++ arch/Config.in.xtensa | 16 ++++++---------- configs/qemu_xtensa_lx60_defconfig | 3 +-- configs/qemu_xtensa_lx60_nommu_defconfig | 3 +-- 4 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 090e60a..2261e0c 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -194,6 +194,17 @@ config BR2_GLIBC_VERSION_2_22 Support for glibc version 2.22 has been removed. The current default version has been selected instead. +config BR2_XTENSA_CUSTOM_NAME + string "The BR2_XTENSA_CUSTOM_NAME option has been renamed" + help + The BR2_XTENSA_CUSTOM_NAME option has been renamed + to BR2_XTENSA_CORE_NAME. + +config BR2_XTENSA_CUSTOM_NAME_WRAP + bool + default y if BR2_XTENSA_CUSTOM_NAME != "" + select BR2_LEGACY + ############################################################################### comment "Legacy options removed in 2017.02" diff --git a/arch/Config.in.xtensa b/arch/Config.in.xtensa index fcb3dc9..263af80 100644 --- a/arch/Config.in.xtensa +++ b/arch/Config.in.xtensa @@ -2,30 +2,26 @@ choice prompt "Target Architecture Variant" depends on BR2_xtensa default BR2_xtensa_fsf + config BR2_XTENSA_CUSTOM select BR2_ARCH_HAS_MMU_OPTIONAL bool "Custom Xtensa processor configuration" + config BR2_xtensa_fsf select BR2_ARCH_HAS_MMU_MANDATORY bool "fsf - Default configuration" + endchoice -config BR2_XTENSA_CUSTOM_NAME - string "Custom Xtensa processor configuration name" - depends on BR2_XTENSA_CUSTOM - default "" +config BR2_XTENSA_CORE_NAME + string "Custom Xtensa processor configuration name" if BR2_XTENSA_CUSTOM + default BR2_XTENSA_CUSTOM_NAME if BR2_XTENSA_CUSTOM_NAME != "" # legacy help Name given to a custom Xtensa processor configuration. -config BR2_XTENSA_CORE_NAME - string - default BR2_XTENSA_CUSTOM_NAME if BR2_XTENSA_CUSTOM - default "" if BR2_xtensa_fsf - config BR2_XTENSA_OVERLAY_DIR string "Overlay directory for custom configuration" depends on BR2_XTENSA_CUSTOM - default "" help Provide the directory path that contains the overlay file for a custom processor configuration. The path is relative diff --git a/configs/qemu_xtensa_lx60_defconfig b/configs/qemu_xtensa_lx60_defconfig index 54d844d..5c0cf8c 100644 --- a/configs/qemu_xtensa_lx60_defconfig +++ b/configs/qemu_xtensa_lx60_defconfig @@ -1,8 +1,7 @@ # Architecture BR2_xtensa=y BR2_XTENSA_CUSTOM=y -BR2_XTENSA_CUSTOM_NAME="dc233c" -BR2_XTENSA_CORE_NAME="lx60" +BR2_XTENSA_CORE_NAME="dc233c" BR2_XTENSA_OVERLAY_DIR="board/qemu/xtensa-lx60" # Patches diff --git a/configs/qemu_xtensa_lx60_nommu_defconfig b/configs/qemu_xtensa_lx60_nommu_defconfig index 256cbee..97e5c98 100644 --- a/configs/qemu_xtensa_lx60_nommu_defconfig +++ b/configs/qemu_xtensa_lx60_nommu_defconfig @@ -1,8 +1,7 @@ # Architecture BR2_xtensa=y BR2_XTENSA_CUSTOM=y -BR2_XTENSA_CUSTOM_NAME="dc233c" -BR2_XTENSA_CORE_NAME="lx60" +BR2_XTENSA_CORE_NAME="dc233c" BR2_XTENSA_OVERLAY_DIR="board/qemu/xtensa-lx60" # Toolchain