Commit b58bf60b authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Peter Korsgaard
Browse files

support/kconfig: use kconfig-provided way of setting the CONFIG_ prefix 



It's now been a while since it has been possible to build the kconfig
parser to understand a prefix other than CONFIG_, and even no prefix
at all, by setting the CONFIG_ macro (#define) at biuld time.

Just use that, insted of patching, it will make it easier for us in the
future.

Our patches have been refreshed at the same time.

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 49f83638

support/kconfig/Makefile.br

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ host-cxxmulti := $(foreach m,$(__hostprogs),\ 
host-cobjs := $(addprefix $(obj)/,$(sort $(foreach m,$(__hostprogs),$($(m)-objs))))

host-cxxobjs := $(addprefix $(obj)/,$(sort $(foreach m,$(__hostprogs),$($(m)-cxxobjs))))



HOST_EXTRACFLAGS += -I$(obj)

HOST_EXTRACFLAGS += -I$(obj) -DCONFIG_=\"\"



$(host-csingle): %: %.c

	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $< -o $(obj)/$@

support/kconfig/confdata.c

+17 −18
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
#include <string.h>

#include <time.h>

#include <unistd.h>

#include <libgen.h>



#include "lkc.h"
@@ -308,20 +307,20 @@ load: 
		if (line[0] == '#') {

			if (memcmp(line + 2, CONFIG_, strlen(CONFIG_)))

				continue;

			p = strchr(line + 2, ' ');

			p = strchr(line + 2 + strlen(CONFIG_), ' ');

			if (!p)

				continue;

			*p++ = 0;

			if (strncmp(p, "is not set", 10))

				continue;

			if (def == S_DEF_USER) {

				sym = sym_find(line + 2);

				sym = sym_find(line + 2 + strlen(CONFIG_));

				if (!sym) {

					sym_add_change_count(1);

					goto setsym;

				}

			} else {

				sym = sym_lookup(line + 2, 0);

				sym = sym_lookup(line + 2 + strlen(CONFIG_), 0);

				if (sym->type == S_UNKNOWN)

					sym->type = S_BOOLEAN;

			}
@@ -337,8 +336,8 @@ load: 
			default:

				;

			}

		} else if (isupper(line[0])) {

			p = strchr(line, '=');

		} else if (memcmp(line, CONFIG_, strlen(CONFIG_)) == 0) {

			p = strchr(line + strlen(CONFIG_), '=');

			if (!p)

				continue;

			*p++ = 0;
@@ -349,13 +348,13 @@ load: 
					*p2 = 0;

			}

			if (def == S_DEF_USER) {

				sym = sym_find(line);

				sym = sym_find(line + strlen(CONFIG_));

				if (!sym) {

					sym_add_change_count(1);

					goto setsym;

				}

			} else {

				sym = sym_lookup(line, 0);

				sym = sym_lookup(line + strlen(CONFIG_), 0);

				if (sym->type == S_UNKNOWN)

					sym->type = S_OTHER;

			}
@@ -483,8 +482,8 @@ kconfig_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg) 
			bool skip_unset = (arg != NULL);



			if (!skip_unset)

				fprintf(fp, "# %s is not set\n",

				    sym->name);

				fprintf(fp, "# %s%s is not set\n",

				    CONFIG_, sym->name);

			return;

		}

		break;
@@ -492,7 +491,7 @@ kconfig_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg) 
		break;

	}



	fprintf(fp, "%s=%s\n", sym->name, value);

	fprintf(fp, "%s%s=%s\n", CONFIG_, sym->name, value);

}



static void
@@ -542,8 +541,8 @@ header_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg) 
			suffix = "_MODULE";

			/* fall through */

		default:

			fprintf(fp, "#define %s%s 1\n",

			    sym->name, suffix);

			fprintf(fp, "#define %s%s%s 1\n",

			    CONFIG_, sym->name, suffix);

		}

		break;

	}
@@ -552,14 +551,14 @@ header_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg) 


		if (value[0] != '0' || (value[1] != 'x' && value[1] != 'X'))

			prefix = "0x";

		fprintf(fp, "#define %s %s%s\n",

		    sym->name, prefix, value);

		fprintf(fp, "#define %s%s %s%s\n",

		    CONFIG_, sym->name, prefix, value);

		break;

	}

	case S_STRING:

	case S_INT:

		fprintf(fp, "#define %s %s\n",

		    sym->name, value);

		fprintf(fp, "#define %s%s %s\n",

		    CONFIG_, sym->name, value);

		break;

	default:

		break;
@@ -605,7 +604,7 @@ tristate_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg 
{



	if (sym->type == S_TRISTATE && *value != 'n')

		fprintf(fp, "%s=%c\n", sym->name, (char)toupper(*value));

		fprintf(fp, "%s%s=%c\n", CONFIG_, sym->name, (char)toupper(*value));

}



static struct conf_printer tristate_printer_cb =

support/kconfig/lkc.h

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ extern "C" { 
#define N_(text) (text)



#ifndef CONFIG_

#define CONFIG_ "BR2_"

#define CONFIG_ "CONFIG_"

#endif

static inline const char *CONFIG_prefix(void)

{

support/kconfig/menu.c

+1 −1
Original line number Diff line number Diff line
@@ -635,7 +635,7 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help) 


	if (menu_has_help(menu)) {

		if (sym->name)

			str_printf(help, "%s:\n\n", sym->name);

			str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);

		help_text = menu_get_help(menu);

	}

	str_printf(help, "%s\n", _(help_text));

support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch

+24 −1
Original line number Diff line number Diff line 
---

 confdata.c          |    4 ++--

 gconf.glade         |    2 +-

 mconf.c             |    4 ++--

 zconf.tab.c_shipped |    2 +-

 zconf.y             |    2 +-

 4 files changed, 5 insertions(+), 5 deletions(-)

 5 files changed, 7 insertions(+), 7 deletions(-)



Index: b/gconf.glade

===================================================================
@@ -60,3 +61,25 @@ Index: b/zconf.y 
 

 	if (getenv("ZCONF_DEBUG"))

 		zconfdebug = 1;

Index: b/confdata.c

===================================================================

--- a/confdata.c

+++ b/confdata.c

@@ -25,7 +26,7 @@

 static const char *conf_filename;

 static int conf_lineno, conf_warnings, conf_unsaved;

 

-const char conf_defname[] = "arch/$ARCH/defconfig";

+const char conf_defname[] = ".defconfig";

 

 static void conf_warning(const char *fmt, ...)

 {

@@ -63,7 +64,7 @@

 

 const char *conf_get_configname(void)

 {

-	char *name = getenv("KCONFIG_CONFIG");

+	char *name = getenv("BUILDROOT_CONFIG");

 

 	return name ? name : ".config";

 }