diff mbox

[U-Boot] cosmetic: mconf.c: remove texts referring to modules

Message ID 1406885936-37837-1-git-send-email-maxin.john@enea.com
State Deferred
Delegated to: Tom Rini
Headers show

Commit Message

maxin.john@enea.com Aug. 1, 2014, 9:38 a.m. UTC 
As we don't have the concept of 'loadable modules' in u-boot,
remove texts referring to modules.

Signed-off-by: Maxin B. John <maxin.john@enea.com>
---
 scripts/kconfig/mconf.c | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

Comments

Masahiro Yamada Aug. 1, 2014, 10:42 a.m. UTC | #1 
Hi.


On Fri, 1 Aug 2014 11:38:56 +0200
"Maxin B. John" <maxin.john@enea.com> wrote:

> As we don't have the concept of 'loadable modules' in u-boot,
> remove texts referring to modules.
> 
> Signed-off-by: Maxin B. John <maxin.john@enea.com>

Thanks for your patch, but personally, I am against this patch.

It is true the help message mentioning loadable modules is funny
but it is almost harmless.

So I vote for keeping this file in sync with Linux.

Besides, we already have a similar concept feature, so-called
"standalone" application.
Perhaps we can use Kconfig's loadable modules feature
for the standalone application...

Waiting for comments from other people.


Best Regards
Masahiro Yamada
maxin.john@enea.com Aug. 1, 2014, 10:52 a.m. UTC | #2 
Hi Masahiro-san,

On Fri, Aug 01, 2014 at 07:42:06PM +0900, Masahiro Yamada wrote:
> Hi.
> 
> 
> On Fri, 1 Aug 2014 11:38:56 +0200
> "Maxin B. John" <maxin.john@enea.com> wrote:
> 
> > As we don't have the concept of 'loadable modules' in u-boot,
> > remove texts referring to modules.
> > 
> > Signed-off-by: Maxin B. John <maxin.john@enea.com>
> 
> Thanks for your patch, but personally, I am against this patch.
> 
> It is true the help message mentioning loadable modules is funny
> but it is almost harmless.
> 
> So I vote for keeping this file in sync with Linux.

I agree with your opinion. This was just a cosmetic change anyway.
Please ignore this patch.
 
> Besides, we already have a similar concept feature, so-called
> "standalone" application.
> Perhaps we can use Kconfig's loadable modules feature
> for the standalone application...
> 
> Waiting for comments from other people.
> 
> 
> Best Regards
> Masahiro Yamada

Best Regards,
Maxin
diff mbox

Patch

diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 14cea74..1c952b5 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -26,21 +26,21 @@  static const char mconf_readme[] = N_(
 "Overview\n"
 "--------\n"
 "This interface lets you select features and parameters for the build.\n"
-"Features can either be built-in, modularized, or ignored. Parameters\n"
+"Features can either be built-in or ignored. Parameters\n"
 "must be entered in as decimal or hexadecimal numbers or text.\n"
 "\n"
 "Menu items beginning with following braces represent features that\n"
 "  [ ] can be built in or removed\n"
-"  < > can be built in, modularized or removed\n"
-"  { } can be built in or modularized (selected by other feature)\n"
+"  < > can be built in or removed\n"
+"  { } can be built in (selected by other feature)\n"
 "  - - are selected by other feature,\n"
-"while *, M or whitespace inside braces means to build in, build as\n"
-"a module or to exclude the feature respectively.\n"
+"while * or whitespace inside braces means to build in\n"
+"or to exclude the feature respectively.\n"
 "\n"
 "To change any of these features, highlight it with the cursor\n"
-"keys and press <Y> to build it in, <M> to make it a module or\n"
+"keys and press <Y> to build it in or\n"
 "<N> to remove it.  You may also press the <Space Bar> to cycle\n"
-"through the available options (i.e. Y->N->M->Y).\n"
+"through the available options (i.e. Y->N->Y).\n"
 "\n"
 "Some additional keyboard hints:\n"
 "\n"
@@ -176,9 +176,9 @@  menu_instructions[] = N_(
 	"Arrow keys navigate the menu.  "
 	"<Enter> selects submenus ---> (or empty submenus ----).  "
 	"Highlighted letters are hotkeys.  "
-	"Pressing <Y> includes, <N> excludes, <M> modularizes features.  "
+	"Pressing <Y> includes, <N> excludes features.  "
 	"Press <Esc><Esc> to exit, <?> for Help, </> for Search.  "
-	"Legend: [*] built-in  [ ] excluded  <M> module  < > module capable"),
+	"Legend: [*] built-in  [ ] excluded"),
 radiolist_instructions[] = N_(
 	"Use the arrow keys to navigate this window or "
 	"press the hotkey of the item you wish to select "
@@ -194,9 +194,6 @@  inputbox_instructions_hex[] = N_(
 inputbox_instructions_string[] = N_(
 	"Please enter a string value. "
 	"Use the <TAB> key to move from the input field to the buttons below it."),
-setmod_text[] = N_(
-	"This feature depends on another which has been configured as a module.\n"
-	"As a result, this feature will be built as a module."),
 load_config_text[] = N_(
 	"Enter the name of the configuration file you wish to load.  "
 	"Accept the name shown to restore the configuration you "
@@ -722,8 +719,6 @@  static void conf(struct menu *menu, struct menu *active_menu)
 			if (item_is_tag('t')) {
 				if (sym_set_tristate_value(sym, yes))
 					break;
-				if (sym_set_tristate_value(sym, mod))
-					show_textbox(NULL, setmod_text, 6, 74);
 			}
 			break;
 		case 6: