From patchwork Fri Dec 27 20:54:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 305469 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 257462C00A5 for ; Sat, 28 Dec 2013 07:54:27 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 805158B195; Fri, 27 Dec 2013 20:54:26 +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 KAqJ1qibCpkZ; Fri, 27 Dec 2013 20:54:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 169058AF8B; Fri, 27 Dec 2013 20:54:24 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 45B4E1C2AB8 for ; Fri, 27 Dec 2013 20:54:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 3E7B68BF5D for ; Fri, 27 Dec 2013 20:54:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id wS8g2NVk5Y9P for ; Fri, 27 Dec 2013 20:54:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by whitealder.osuosl.org (Postfix) with ESMTPS id C70218BF61 for ; Fri, 27 Dec 2013 20:54:21 +0000 (UTC) Received: by mail-wi0-f170.google.com with SMTP id hq4so14058418wib.3 for ; Fri, 27 Dec 2013 12:54:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=bt4ZiKrp3XwOMNKJ54YTSuY8OQOe4ZPVuUAzvS1cUOE=; b=jnVQta9VBM2uLjCxtZYrsniFOA9oTW1y3tJnIIaMkNYM5HI3y+kTpDjrymT7Z4cU3i fUb/MBMtJJ+uQZiP6wtbnL6MMV9D9aqVj8pjs2ij+DXPmuQdIzI84Nu0Y2eGkl9LzMbV sEmDSxpqTKnKJfN+UwKk5BB+8/LK8/5M0MchwhafLQtRduwSgJ5csGNKO5PWjNje6S1G nB9A8Qf1JTvywGf3s9oMFgmqzyh74EAaL+PcRBzQJdR5sZsily64SCsVIMKV4Tcd+Y5k TLDC9WlF7+bsg+80ri1brwkCiEV52+WBeu9X5Uqv4tSXNAybTBolSV/9ajB231pjGW/H 1EMQ== X-Received: by 10.194.86.70 with SMTP id n6mr7353906wjz.71.1388177660287; Fri, 27 Dec 2013 12:54:20 -0800 (PST) Received: from cerise.lan (13-105-190-109.dsl.ovh.fr. [109.190.105.13]) by mx.google.com with ESMTPSA id w1sm56310610wib.6.2013.12.27.12.54.19 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Dec 2013 12:54:19 -0800 (PST) From: Maxime Hadjinlian To: buildroot@busybox.net Date: Fri, 27 Dec 2013 21:54:01 +0100 Message-Id: <1388177641-20805-1-git-send-email-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 1.8.5.1 Subject: [Buildroot] [PATCH] support/kconfig: fix reference to kernel X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net There was some references to the kernel missed by 01-kconfig-kernel-to-buildroot.patch This patch also update kconfig to the one used in 3.13-rc5. The changes are really minor. Signed-off-by: Maxime Hadjinlian --- support/kconfig/README.buildroot | 2 +- support/kconfig/expr.h | 2 +- support/kconfig/mconf.c | 62 +++++++++++----------- support/kconfig/menu.c | 11 ++-- .../patches/01-kconfig-kernel-to-buildroot.patch | 54 +++++++++++++------ support/kconfig/qconf.cc | 5 ++ support/kconfig/qconf.h | 1 + support/kconfig/symbol.c | 2 +- support/kconfig/zconf.l | 1 - 9 files changed, 83 insertions(+), 57 deletions(-) diff --git a/support/kconfig/README.buildroot b/support/kconfig/README.buildroot index 6f65715..62e3a11 100644 --- a/support/kconfig/README.buildroot +++ b/support/kconfig/README.buildroot @@ -1,4 +1,4 @@ -This is a copy of the kconfig code in the kernel (currently 3.9-rc2) tweaked +This is a copy of the kconfig code in the kernel (currently 3.13-rc5) tweaked to suit Buildroot. To update: diff --git a/support/kconfig/expr.h b/support/kconfig/expr.h index df198a5..ba663e1 100644 --- a/support/kconfig/expr.h +++ b/support/kconfig/expr.h @@ -93,7 +93,7 @@ struct symbol { #define SYMBOL_CHOICEVAL 0x0020 /* used as a value in a choice block */ #define SYMBOL_VALID 0x0080 /* set when symbol.curr is calculated */ #define SYMBOL_OPTIONAL 0x0100 /* choice is optional - values can be 'n' */ -#define SYMBOL_WRITE 0x0200 /* ? */ +#define SYMBOL_WRITE 0x0200 /* write symbol to file (KCONFIG_CONFIG) */ #define SYMBOL_CHANGED 0x0400 /* ? */ #define SYMBOL_AUTO 0x1000 /* value from environment variable */ #define SYMBOL_CHECKED 0x2000 /* used during dependency checking */ diff --git a/support/kconfig/mconf.c b/support/kconfig/mconf.c index 35e07e0..7d6cf80 100644 --- a/support/kconfig/mconf.c +++ b/support/kconfig/mconf.c @@ -25,7 +25,7 @@ static const char mconf_readme[] = N_( "Overview\n" "--------\n" -"This interface let you select features and parameters for the build.\n" +"This interface lets you select features and parameters for the build.\n" "Features can either be built-in, modularized, or ignored. Parameters\n" "must be entered in as decimal or hexadecimal numbers or text.\n" "\n" @@ -39,15 +39,15 @@ static const char mconf_readme[] = N_( "\n" "To change any of these features, highlight it with the cursor\n" "keys and press to build it in, to make it a module or\n" -" to removed it. You may also press the to cycle\n" -"through the available options (ie. Y->N->M->Y).\n" +" to remove it. You may also press the to cycle\n" +"through the available options (i.e. Y->N->M->Y).\n" "\n" "Some additional keyboard hints:\n" "\n" "Menus\n" "----------\n" -"o Use the Up/Down arrow keys (cursor keys) to highlight the item\n" -" you wish to change or submenu wish to select and press .\n" +"o Use the Up/Down arrow keys (cursor keys) to highlight the item you\n" +" wish to change or the submenu you wish to select and press .\n" " Submenus are designated by \"--->\", empty ones by \"----\".\n" "\n" " Shortcut: Press the option's highlighted letter (hotkey).\n" @@ -65,7 +65,7 @@ static const char mconf_readme[] = N_( " there is a delayed response which you may find annoying.\n" "\n" " Also, the and cursor keys will cycle between