From b58bf60b519353e983e372f5627d639e7cc72a7a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 14 Apr 2013 02:53:17 +0000 Subject: 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: "Yann E. MORIN" Signed-off-by: Peter Korsgaard --- .../patches/01-kconfig-kernel-to-buildroot.patch | 25 +++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) (limited to 'support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch') diff --git a/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch b/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch index f28131cf8..d7206a004 100644 --- a/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch +++ b/support/kconfig/patches/01-kconfig-kernel-to-buildroot.patch @@ -1,9 +1,10 @@ --- + 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"; + } -- cgit v1.2.3