Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0e150ac authored by Roman Zippel's avatar Roman Zippel Committed by Sam Ravnborg
Browse files

kconfig: remove SYMBOL_{YES,MOD,NO} 



The SYMBOL_{YES,MOD,NO} are not really used anymore (they were more used be
the cml1 converter), so just remove them.

Signed-off-by: default avatarRoman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent c955ccaf

scripts/kconfig/expr.c

+2 −1
Original line number Diff line number Diff line
@@ -145,7 +145,8 @@ static void __expr_eliminate_eq(enum expr_type type, struct expr **ep1, struct e 
		return;

	}

	if (e1->type == E_SYMBOL && e2->type == E_SYMBOL &&

	    e1->left.sym == e2->left.sym && (e1->left.sym->flags & (SYMBOL_YES|SYMBOL_NO)))

	    e1->left.sym == e2->left.sym &&

	    (e1->left.sym == &symbol_yes || e1->left.sym == &symbol_no))

		return;

	if (!expr_eq(e1, e2))

		return;

scripts/kconfig/expr.h

+1 −4
Original line number Diff line number Diff line
@@ -78,10 +78,7 @@ struct symbol { 


#define for_all_symbols(i, sym) for (i = 0; i < 257; i++) for (sym = symbol_hash[i]; sym; sym = sym->next) if (sym->type != S_OTHER)



#define SYMBOL_YES		0x0001

#define SYMBOL_MOD		0x0002

#define SYMBOL_NO		0x0004

#define SYMBOL_CONST		0x0007

#define SYMBOL_CONST		0x0001

#define SYMBOL_CHECK		0x0008

#define SYMBOL_CHOICE		0x0010

#define SYMBOL_CHOICEVAL	0x0020

scripts/kconfig/gconf.c

+0 −6
Original line number Diff line number Diff line
@@ -114,12 +114,6 @@ const char *dbg_print_flags(int val) 


	bzero(buf, 256);



	if (val & SYMBOL_YES)

		strcat(buf, "yes/");

	if (val & SYMBOL_MOD)

		strcat(buf, "mod/");

	if (val & SYMBOL_NO)

		strcat(buf, "no/");

	if (val & SYMBOL_CONST)

		strcat(buf, "const/");

	if (val & SYMBOL_CHECK)

scripts/kconfig/symbol.c

+3 −3
Original line number Diff line number Diff line
@@ -15,15 +15,15 @@ 
struct symbol symbol_yes = {

	.name = "y",

	.curr = { "y", yes },

	.flags = SYMBOL_YES|SYMBOL_VALID,

	.flags = SYMBOL_CONST|SYMBOL_VALID,

}, symbol_mod = {

	.name = "m",

	.curr = { "m", mod },

	.flags = SYMBOL_MOD|SYMBOL_VALID,

	.flags = SYMBOL_CONST|SYMBOL_VALID,

}, symbol_no = {

	.name = "n",

	.curr = { "n", no },

	.flags = SYMBOL_NO|SYMBOL_VALID,

	.flags = SYMBOL_CONST|SYMBOL_VALID,

}, symbol_empty = {

	.name = "",

	.curr = { "", no },