From 0c1cea29e720d11827f20b4791fa3768c0eea2ac Mon Sep 17 00:00:00 2001 From: Christopher Kilgour Date: Thu, 20 Mar 2008 01:56:05 +0000 Subject: Allow 'make menuconfig' to function within libpayload. Removes reference to BusyBox. Signed-off-by: Christopher Kilgour Acked-by: Uwe Hermann git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3178 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- payloads/libpayload/util/kconfig/confdata.c | 2 +- payloads/libpayload/util/kconfig/kconfig_load.c | 2 +- payloads/libpayload/util/kconfig/mconf.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'payloads/libpayload/util/kconfig') diff --git a/payloads/libpayload/util/kconfig/confdata.c b/payloads/libpayload/util/kconfig/confdata.c index 898ae91bd7..363e40c33c 100644 --- a/payloads/libpayload/util/kconfig/confdata.c +++ b/payloads/libpayload/util/kconfig/confdata.c @@ -22,7 +22,7 @@ static int conf_lineno, conf_warnings, conf_unsaved; const char conf_def_filename[] = ".config"; -const char conf_defname[] = "scripts/defconfig"; +const char conf_defname[] = "util/defconfig"; const char *conf_confnames[] = { ".config", diff --git a/payloads/libpayload/util/kconfig/kconfig_load.c b/payloads/libpayload/util/kconfig/kconfig_load.c index dbdcaad823..03dd33812e 100644 --- a/payloads/libpayload/util/kconfig/kconfig_load.c +++ b/payloads/libpayload/util/kconfig/kconfig_load.c @@ -15,7 +15,7 @@ void kconfig_load(void) handle = dlopen("./libkconfig.so", RTLD_LAZY); if (!handle) { - handle = dlopen("./scripts/kconfig/libkconfig.so", RTLD_LAZY); + handle = dlopen("./util/kconfig/libkconfig.so", RTLD_LAZY); if (!handle) { fprintf(stderr, "%s\n", dlerror()); exit(1); diff --git a/payloads/libpayload/util/kconfig/mconf.c b/payloads/libpayload/util/kconfig/mconf.c index 1c3331c3b0..b39a964f9d 100644 --- a/payloads/libpayload/util/kconfig/mconf.c +++ b/payloads/libpayload/util/kconfig/mconf.c @@ -324,7 +324,7 @@ static void cprint_init(void) memset(args, 0, sizeof(args)); indent = 0; child_count = 0; - cprint("./scripts/kconfig/lxdialog/lxdialog"); + cprint("./util/kconfig/lxdialog/lxdialog"); cprint("--backtitle"); cprint(menu_backtitle); } @@ -1052,7 +1052,7 @@ int main(int ac, char **av) sym = sym_lookup("KERNELVERSION", 0); sym_calc_value(sym); - sprintf(menu_backtitle, _("BusyBox %s Configuration"), + sprintf(menu_backtitle, _("libpayload %s Configuration"), sym_get_string_value(sym)); mode = getenv("MENUCONFIG_MODE"); -- cgit v1.2.3