coreboot September 2011

coreboot@coreboot.org

40 participants
224 discussions

Patch set updated: f916d99 Update defconfig to silence build
by Patrick Georgi 02 Sep '11

02 Sep '11

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/117 -gerrit commit f916d994f716444edc72ec8af0c9020e16f486ea Author: Patrick Georgi <patrick.georgi(a)secunet.com> Date: Tue Jul 19 16:35:34 2011 +0200 Update defconfig to silence build Change-Id: Iecc5fef8df78e66bb80b00d786aa4925f13c823a Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> --- configs/defconfig | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/configs/defconfig b/configs/defconfig index bee9611..0fe3019 100644 --- a/configs/defconfig +++ b/configs/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # FILO version: 0.6.0 -# Fri Mar 26 12:50:23 2010 +# Thu Jul 7 11:47:53 2011 # CONFIG_TARGET_I386=y @@ -62,5 +62,6 @@ CONFIG_EXPERIMENTAL=y # CONFIG_DEBUG_PCI is not set # CONFIG_DEBUG_LINUXLOAD is not set # CONFIG_DEBUG_IDE is not set +# CONFIG_DEBUG_USB is not set # CONFIG_DEBUG_ELTORITO is not set CONFIG_DEVELOPER_TOOLS=y

1 0

Patch set updated: b431050 Remove useless print_a_completion() stub
by Patrick Georgi 02 Sep '11

02 Sep '11

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/118 -gerrit commit b4310501fa616a4e5267b57adcb06fbc226a5a14 Author: Patrick Georgi <patrick.georgi(a)secunet.com> Date: Tue Jul 19 16:37:13 2011 +0200 Remove useless print_a_completion() stub There's a real implementation elsewhere and this one only confuses things. Change-Id: I841d9baecbaf298114e508feec89f1b2ea864bb9 Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> --- main/filo.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/main/filo.c b/main/filo.c index c81d458..a8bf372 100644 --- a/main/filo.c +++ b/main/filo.c @@ -237,9 +237,4 @@ int main(void) return 0; } -void print_a_completion (char *name) -{ - // Nothing yet. -} - #endif /* CONFIG_USE_GRUB */

1 0

Patch set updated: 7f65f07 Add POSIXy readdir/scandir support
by Patrick Georgi 02 Sep '11

02 Sep '11

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/119 -gerrit commit 7f65f079c80bf52ff9e2f12b3c118ad3dcb5647b Author: Patrick Georgi <patrick.georgi(a)secunet.com> Date: Tue Jul 19 16:38:23 2011 +0200 Add POSIXy readdir/scandir support This abuses the print_a_completion mechanism to build the right data structures to support opendir/readdir/closedir and scandir on top of them. It's BSD-licensed so it can eventually be moved over to libpayload. Change-Id: Iadc1daed3cab4cf2ead778c23ad756d36cbbb99a Signed-off-by: Patrick Georgi <patrick.georgi(a)secunet.com> --- fs/vfs.c | 118 ++++++++++++++++++++++++++++++++++++++++++++++- include/dirent.h | 28 +++++++++++ include/grub/shared.h | 2 +- main/grub/completions.c | 27 ----------- 4 files changed, 146 insertions(+), 29 deletions(-) diff --git a/fs/vfs.c b/fs/vfs.c index 49b38d8..18dbcbc 100644 --- a/fs/vfs.c +++ b/fs/vfs.c @@ -24,6 +24,7 @@ #include <config.h> #include <fs.h> #include "filesys.h" +#include <dirent.h> #define DEBUG_THIS CONFIG_DEBUG_VFS #include <debug.h> @@ -241,7 +242,7 @@ void file_close(void) devclose(); } -int dir(char *dirname) +int dir(const char *dirname) { char *dev = 0; const char *path; @@ -300,6 +301,8 @@ int dir(char *dirname) retval = fsys->dir_func((char *) path); + print_possibilities = 0; + out: if (dev) free(dev); @@ -307,4 +310,117 @@ out: return retval; } +/* The following functions are BSD-L, Copyright 2011 secunet AG + * licensing is chosen to simplify migration to libpayload at some point */ + +struct dirent **opendir_s; +int opendir_ssize, opendir_selem; + +void print_a_completion(char *name) +{ + opendir_s[opendir_selem] = malloc(sizeof(struct dirent)); + opendir_s[opendir_selem]->d_name = strdup(name); + opendir_selem++; + if (opendir_selem == opendir_ssize) { + opendir_ssize *= 2; + opendir_s = realloc(opendir_s, sizeof(struct dirent*)*opendir_ssize); + } + opendir_s[opendir_selem] = 0; +} + +DIR *opendir(const char *path) +{ + DIR *p = malloc(sizeof(DIR)); + + if (opendir_s) free(opendir_s); + opendir_ssize = 32; + opendir_selem = 0; + opendir_s = malloc(sizeof(struct dirent*)*opendir_ssize); + dir(path); + p->items = opendir_s; + p->cur = opendir_s; + return p; +} + +struct dirent *readdir(DIR *dirp) +{ + if (NULL == *dirp->cur) return NULL; + + return *(dirp->cur++); +} + +int closedir(DIR *dirp) +{ + if (!dirp) return -1; + + struct dirent **cur = dirp->items; + while (*cur) { + free(*cur); + cur++; + } + free(dirp->items); + free(dirp); + + return 0; +} + +static int (*metafilter_flt)(const struct dirent *); +static int (*metafilter_cmp)(const struct dirent **, const struct dirent **); + +static int metafilter(const struct dirent **a, const struct dirent **b) +{ + /* make sure that filtered out entries end up at the end, for simple elimination */ + if ((metafilter_flt(*a) == 0) && (metafilter_flt(*b) == 0)) + return 0; + if (metafilter_flt(*a) == 0) + return 1; + if (metafilter_flt(*b) == 0) + return -1; + return metafilter_cmp(a, b); +} + +int scandir(const char *path, struct dirent ***namelist, + int (*filter)(const struct dirent *), + int (*compar)(const struct dirent **, const struct dirent **)) +{ + DIR *dirp = opendir(path); + + struct dirent **e = dirp->items; + int nelem = 0; + while (*e) { + nelem++; + e++; + } + + if (filter) { + metafilter_flt = filter; + metafilter_cmp = compar; + compar = metafilter; + } + + *namelist = malloc(sizeof(struct dirent*)*nelem); + memcpy(*namelist, dirp->items, sizeof(struct dirent*)*nelem); + qsort(*namelist, nelem, sizeof(struct dirent*), (int(*)(const void*, const void*))compar); + + // if things were filtered, truncate them away + if (filter) { + int nelem2; + e = *namelist; + nelem2 = 0; + while ((nelem > nelem2) && filter(*e)) { + nelem2++; + e++; + } + realloc(namelist, sizeof(struct dirent**)*nelem2); + } + + return nelem; +} + +int alphasort(const struct dirent **a, const struct dirent **b) +{ + const struct dirent *a1 = *(const struct dirent **)(a); + const struct dirent *b1 = *(const struct dirent **)(b); + return strcmp(a1->d_name, b1->d_name); +} diff --git a/include/dirent.h b/include/dirent.h new file mode 100644 index 0000000..19b3696 --- /dev/null +++ b/include/dirent.h @@ -0,0 +1,28 @@ +/* Copyright 2011 secunet AG + * written by Patrick Georgi <patrick.georgi(a)secunet.com> + * + * Licensed as BSD-L to ease migration to libpayload */ + +#ifndef __DIRENT_H +#define __DIRENT_H +struct dirent { + char *d_name; +}; + +typedef struct { + struct dirent **items; + struct dirent **cur; +} DIR; + +DIR *opendir(const char *path); +struct dirent *readdir(DIR *dirp); +int closedir(DIR *dirp); // 0 on success, -1 on error, with errno set + +int scandir(const char *path, struct dirent ***namelist, + int (*filter)(const struct dirent *), + int (*compar)(const struct dirent **, const struct dirent **)); + +int alphasort(const struct dirent **a, const struct dirent **b); + +#endif + diff --git a/include/grub/shared.h b/include/grub/shared.h index 8d876de..127b74f 100644 --- a/include/grub/shared.h +++ b/include/grub/shared.h @@ -295,7 +295,7 @@ void grub_putstr (const char *str); /* List the contents of the directory that was opened with GRUB_OPEN, printing all completions. */ -int dir (char *dirname); +int dir (const char *dirname); /* Display device and filename completions. */ void print_a_completion (char *filename); diff --git a/main/grub/completions.c b/main/grub/completions.c index 6588301..161026b 100644 --- a/main/grub/completions.c +++ b/main/grub/completions.c @@ -64,33 +64,6 @@ set_device (char *device) return 0; } -/* If DO_COMPLETION is true, just print NAME. Otherwise save the unique - part into UNIQUE_STRING. */ -void print_a_completion(char *name) -{ - /* If NAME is "." or "..", do not count it. */ - if (strcmp(name, ".") == 0 || strcmp(name, "..") == 0) - return; - - if (do_completion) { - char *buf = unique_string; - - if (!unique) - while ((*buf++ = *name++)); - else { - while (*buf && (*buf == *name)) { - buf++; - name++; - } - /* mismatch, strip it. */ - *buf = '\0'; - } - } else - grub_printf(" %s", name); - - unique++; -} - /* * This lists the possible completions of a device string, filename, or * any sane combination of the two.

1 0

New patch to review: 54caffb Fix FILO build system
by Patrick Georgi 02 Sep '11

02 Sep '11

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/177 -gerrit commit 54caffbbea39033208ace7fa6d0beef741344a7d Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Fri Sep 2 22:44:15 2011 +0200 Fix FILO build system This change: - deduplicates a whole lot of stuff in the Kconfig makefile - simplifies "verbose" support (V=1) to match coreboot's style - adds libpayload support to more kconfig targets (allyes, allno, defconfig...) - isolates libpayload build into its own directory to avoid file clashes Change-Id: Iee682492f64f0f5da2a8702b8fe6f8b02c81b4c5 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- Makefile | 56 +++++----- util/kconfig/Makefile | 285 ++++++++++++++++--------------------------------- 2 files changed, 124 insertions(+), 217 deletions(-) diff --git a/Makefile b/Makefile index 2e8a9e5..1ebf62e 100644 --- a/Makefile +++ b/Makefile @@ -38,8 +38,11 @@ HAVE_DOTCONFIG := $(wildcard .config) BUILD_INFO = ($(shell whoami)@$(shell hostname)) $(shell LANG=C date) # Make is silent per default, but 'make V=1' will show all compiler calls. +Q=@ ifneq ($(V),1) -Q := @ +ifneq ($(Q),) +.SILENT: +endif endif $(if $(wildcard .xcompile),,$(eval $(shell bash util/xcompile/xcompile > .xcompile))) @@ -114,52 +117,53 @@ libpayload: @printf "Found Libpayload $(LIBPAYLOAD).\n" else libpayload: $(src)/$(LIB_CONFIG) - $(Q)printf "building libpayload.\n" - $(Q)make -C $(LIBCONFIG_PATH) distclean - $(Q)cp lib.config $(LIBCONFIG_PATH)/.config - $(Q)make -C $(LIBCONFIG_PATH) oldconfig - $(Q)make -C $(LIBCONFIG_PATH) DESTDIR=$(src)/build install + printf "building libpayload.\n" + $(MAKE) -C $(LIBCONFIG_PATH) obj=$(obj)/libpayload-build distclean + cp lib.config $(LIBCONFIG_PATH)/.config + mkdir -p $(LIBCONFIG_PATH)/build + $(MAKE) -C $(LIBCONFIG_PATH) obj=$(obj)/libpayload-build oldconfig + $(MAKE) -C $(LIBCONFIG_PATH) obj=$(obj)/libpayload-build DESTDIR=$(src)/build install endif $(obj)/filo: $(src)/.config $(OBJS) libpayload - $(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(LD) -N -T $(ARCHDIR-y)/ldscript -o $@ $(OBJS) $(LIBPAYLOAD) $(LIBGCC) + printf " LD $(subst $(shell pwd)/,,$(@))\n" + $(LD) -N -T $(ARCHDIR-y)/ldscript -o $@ $(OBJS) $(LIBPAYLOAD) $(LIBGCC) $(TARGET): $(obj)/filo libpayload - $(Q)cp $(obj)/filo $@ - $(Q)$(NM) $(obj)/filo | sort > $(obj)/filo.map - $(Q)printf " STRIP $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(STRIP) -s $@ + cp $(obj)/filo $@ + $(NM) $(obj)/filo | sort > $(obj)/filo.map + printf " STRIP $(subst $(shell pwd)/,,$(@))\n" + $(STRIP) -s $@ include util/kconfig/Makefile $(obj)/%.o: $(src)/%.c libpayload - $(Q)printf " CC $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(CC) -MMD $(CFLAGS) $(CPPFLAGS) -c -o $@ $< + printf " CC $(subst $(shell pwd)/,,$(@))\n" + $(CC) -MMD $(CFLAGS) $(CPPFLAGS) -c -o $@ $< $(obj)/%.S.o: $(src)/%.S - $(Q)printf " AS $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(AS) $(ASFLAGS) -o $@ $< + printf " AS $(subst $(shell pwd)/,,$(@))\n" + $(AS) $(ASFLAGS) -o $@ $< endif $(obj)/version.h: FORCE - $(Q)echo '#define PROGRAM_NAME "$(PROGRAM_NAME)"' > $@ - $(Q)echo '#define PROGRAM_VERSION "$(PROGRAM_VERSION)"' >> $@ - $(Q)echo '#define PROGRAM_VERSION_FULL "$(PROGRAM_VERSION) $(BUILD_INFO)"' >> $@ - $(Q)echo '#define BUILD_INFO "$(BUILD_INFO)"' >> $@ + echo '#define PROGRAM_NAME "$(PROGRAM_NAME)"' > $@ + echo '#define PROGRAM_VERSION "$(PROGRAM_VERSION)"' >> $@ + echo '#define PROGRAM_VERSION_FULL "$(PROGRAM_VERSION) $(BUILD_INFO)"' >> $@ + echo '#define BUILD_INFO "$(BUILD_INFO)"' >> $@ prepare: - $(Q)mkdir -p $(obj)/util/kconfig/lxdialog - $(Q)mkdir -p $(obj)/i386 $(obj)/fs $(obj)/drivers/flash - $(Q)mkdir -p $(obj)/main/grub + mkdir -p $(obj)/util/kconfig/lxdialog + mkdir -p $(obj)/i386 $(obj)/fs $(obj)/drivers/flash + mkdir -p $(obj)/main/grub clean: - $(Q)rm -rf $(obj)/i386 $(obj)/fs $(obj)/drivers $(obj)/main $(obj)/util + rm -rf $(obj)/i386 $(obj)/fs $(obj)/drivers $(obj)/main $(obj)/util distclean: clean - $(Q)rm -rf build - $(Q)rm -f .config lib.config .config.old .xcompile ..config.tmp .kconfig.d .tmpconfig* + rm -rf build + rm -f .config lib.config .config.old .xcompile ..config.tmp .kconfig.d .tmpconfig* FORCE: diff --git a/util/kconfig/Makefile b/util/kconfig/Makefile index d6670fd..64a340c 100644 --- a/util/kconfig/Makefile +++ b/util/kconfig/Makefile @@ -2,7 +2,8 @@ # Kernel configuration targets # These targets are used from top-level makefile -PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config +PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig +PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig _OS=$(shell uname -s |cut -c-7) regex-objs= @@ -17,206 +18,108 @@ LIB_CONFIG := $(src)/lib.config HAVE_FILO_CONFIG := $(wildcard $(FILO_CONFIG)) HAVE_LIB_CONFIG := $(wildcard $(LIB_CONFIG)) -ifneq ($(strip $(HAVE_FILO_CONFIG)),) -ifneq ($(strip $(HAVE_LIB_CONFIG)),) -xconfig: prepare $(objk)/qconf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)mv $(FILO_CONFIG) $(FILO_CONFIG)."temp" - $(Q)mv $(LIB_CONFIG) $(FILO_CONFIG) - $(Q)$(objk)/qconf $(LIBCONFIG_PATH)/Config.in - $(Q)mv $(FILO_CONFIG) $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)mv $(FILO_CONFIG)."temp" $(FILO_CONFIG) - $(Q)$(objk)/qconf $(Kconfig) -else -xconfig: prepare $(objk)/qconf - $(Q)printf "Lost libpayload config file.\n" - $(Q)rm -f $(FILO_CONFIG) -endif +# We don't know how to cope with FILO config being present and +# libpayload config not. +$(if $(and $(HAVE_FILO_CONFIG),$(filter 0,$(words $(LIB_CONFIG)))), \ + FATAL:=1, \ + FATAL:=0) + +LIBPAYLOAD_CONFIG_PRE := echo "Libpayload config for FILO." \ + $(if $(HAVE_FILO_CONFIG),; mv $(FILO_CONFIG) $(FILO_CONFIG).temp) \ + $(if $(HAVE_LIB_CONFIG),; mv $(LIB_CONFIG) $(FILO_CONFIG)) + +LIBPAYLOAD_CONFIG_POST := mv $(FILO_CONFIG) $(LIB_CONFIG) \ + ; echo "Libpayload config done." \ + $(if $(HAVE_FILO_CONFIG),; mv $(FILO_CONFIG).temp $(FILO_CONFIG)) + +ifeq ($(FATAL),1) +xconfig gconfig menuconfig config oldconfig silentoldconfig: + echo "Lost libpayload config file." + rm -f $(FILO_CONFIG) else xconfig: prepare $(objk)/qconf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)$(objk)/qconf $(LIBCONFIG_PATH)/Config.in - $(Q)mv $(FILO_CONFIG) $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)$(objk)/qconf $(Kconfig) -endif + $(LIBPAYLOAD_CONFIG_PRE) + $(objk)/qconf $(LIBCONFIG_PATH)/Config.in + $(LIBPAYLOAD_CONFIG_POST) + $(objk)/qconf $(Kconfig) -ifneq ($(strip $(HAVE_FILO_CONFIG)),) -ifneq ($(strip $(HAVE_LIB_CONFIG)),) -gconfig: prepare $(objk)/gconf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)mv $(FILO_CONFIG) $(FILO_CONFIG)."temp" - $(Q)mv $(LIB_CONFIG) $(FILO_CONFIG) - $(Q)$(objk)/gconf $(LIBCONFIG_PATH)/Config.in - $(Q)mv $(FILO_CONFIG) $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)mv $(FILO_CONFIG)."temp" $(FILO_CONFIG) - $(Q)$(objk)/gconf $(Kconfig) -else -gconfig: prepare $(objk)/gconf - $(Q)printf "Lost libpayload config file.\n" - $(Q)rm -f $(FILO_CONFIG) -endif -else gconfig: prepare $(objk)/gconf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)$(objk)/gconf $(LIBCONFIG_PATH)/Config.in - $(Q)mv $(FILO_CONFIG) $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)$(objk)/gconf $(Kconfig) -endif + $(LIBPAYLOAD_CONFIG_PRE) + $(objk)/gconf $(LIBCONFIG_PATH)/Config.in + $(LIBPAYLOAD_CONFIG_POST) + $(objk)/gconf $(Kconfig) -ifneq ($(strip $(HAVE_FILO_CONFIG)),) -ifneq ($(strip $(HAVE_LIB_CONFIG)),) -menuconfig: prepare $(objk)/mconf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)mv $(FILO_CONFIG) $(FILO_CONFIG)."temp" - $(Q)mv $(LIB_CONFIG) $(FILO_CONFIG) - $(Q)$(objk)/mconf $(LIBCONFIG_PATH)/Config.in - $(Q)mv $(FILO_CONFIG) $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)mv $(FILO_CONFIG)."temp" $(FILO_CONFIG) - $(Q)$(objk)/mconf $(Kconfig) -else -menuconfig: prepare $(objk)/mconf - $(Q)printf "Lost libpayload config file.\n" - $(Q)rm -f $(FILO_CONFIG) -endif -else menuconfig: prepare $(objk)/mconf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)$(objk)/mconf $(LIBCONFIG_PATH)/Config.in - $(Q)mv $(FILO_CONFIG) $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)$(objk)/mconf $(Kconfig) -endif + $(LIBPAYLOAD_CONFIG_PRE) + $(objk)/mconf $(LIBCONFIG_PATH)/Config.in + $(LIBPAYLOAD_CONFIG_POST) + $(objk)/mconf $(Kconfig) -ifneq ($(strip $(HAVE_FILO_CONFIG)),) -ifneq ($(strip $(HAVE_LIB_CONFIG)),) -config: prepare $(objk)/conf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)mv $(FILO_CONFIG) $(FILO_CONFIG)."temp" - $(Q)mv $(LIB_CONFIG) $(FILO_CONFIG) - $(Q)$(objk)/conf $(LIBCONFIG_PATH)/Config.in - $(Q)mv $(FILO_CONFIG) $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)mv $(FILO_CONFIG)."temp" $(FILO_CONFIG) - $(Q)$(objk)/conf $(Kconfig) -else -config: prepare $(objk)/conf - $(Q)printf "Lost libpayload config file.\n" - $(Q)rm -f $(FILO_CONFIG) -endif -else config: prepare $(objk)/conf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)$(objk)/conf $(LIBCONFIG_PATH)/Config.in - $(Q)mv $(FILO_CONFIG) $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)$(objk)/conf $(Kconfig) -endif + $(LIBPAYLOAD_CONFIG_PRE) + $(objk)/conf $(LIBCONFIG_PATH)/Config.in + $(LIBPAYLOAD_CONFIG_POST) + $(objk)/conf $(Kconfig) -ifneq ($(strip $(HAVE_FILO_CONFIG)),) -ifneq ($(strip $(HAVE_LIB_CONFIG)),) -oldconfig: prepare $(objk)/conf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)mv $(FILO_CONFIG) $(FILO_CONFIG)."temp" - $(Q)mv $(LIB_CONFIG) $(FILO_CONFIG) - $(Q)$(objk)/conf -o $(LIBCONFIG_PATH)/Config.in - $(Q)mv $(FILO_CONFIG) $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)mv $(FILO_CONFIG)."temp" $(FILO_CONFIG) - $(Q)$(objk)/conf -o $(Kconfig) -else oldconfig: prepare $(objk)/conf - $(Q)printf "Lost libpayload config file.\n" - $(Q)rm -f $(FILO_CONFIG) -endif -else -oldconfig: prepare $(objk)/conf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)$(objk)/conf -o $(LIBCONFIG_PATH)/Config.in - $(Q)mv .config $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)$(objk)/conf -o $(Kconfig) -endif + $(LIBPAYLOAD_CONFIG_PRE) + $(objk)/conf -o $(LIBCONFIG_PATH)/Config.in + $(LIBPAYLOAD_CONFIG_POST) + $(objk)/conf -o $(Kconfig) -ifneq ($(strip $(HAVE_FILO_CONFIG)),) -ifneq ($(strip $(HAVE_LIB_CONFIG)),) silentoldconfig: prepare $(objk)/conf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)mv $(FILO_CONFIG) $(FILO_CONFIG)."temp" - $(Q)mv $(LIB_CONFIG) $(FILO_CONFIG) - $(Q)$(objk)/conf -s $(LIBCONFIG_PATH)/Config.in - $(Q)mv $(FILO_CONFIG) $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)mv $(FILO_CONFIG)."temp" $(FILO_CONFIG) - $(Q)$(objk)/conf -s $(Kconfig) -else -silentoldconfig: prepare $(objk)/conf - $(Q)printf "Lost libpayload config file.\n" - $(Q)rm -f $(FILO_CONFIG) -endif -else -silentoldconfig: prepare $(objk)/conf - $(Q)printf "Libpayload config for FILO.\n" - $(Q)$(objk)/conf -s $(LIBCONFIG_PATH)/Config.in - $(Q)mv .config $(LIB_CONFIG) - $(Q)printf "Libpayload config done.\n" - $(Q)$(objk)/conf -s $(Kconfig) - -endif - -# --- UNUSED, ignore ---------------------------------------------------------- -# Create new linux.pot file -# Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files -# The symlink is used to repair a deficiency in arch/um -update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h - $(Q)echo " GEN config" - $(Q)xgettext --default-domain=linux \ - --add-comments --keyword=_ --keyword=N_ \ - --from-code=UTF-8 \ - --files-from=scripts/kconfig/POTFILES.in \ - --output $(obj)/config.pot - $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot - $(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch - $(Q)(for i in `ls arch/`; \ - do \ - echo " GEN $$i"; \ - $(obj)/kxgettext arch/$$i/Kconfig \ - >> $(obj)/config.pot; \ - done ) - $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \ - --output $(obj)/linux.pot - $(Q)rm -f arch/um/Kconfig.arch - $(Q)rm -f $(obj)/config.pot -# --- UNUSED, ignore ---------------------------------------------------------- - -PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig + $(LIBPAYLOAD_CONFIG_PRE) + $(objk)/conf -s $(LIBCONFIG_PATH)/Config.in + $(LIBPAYLOAD_CONFIG_POST) + $(objk)/conf -s $(Kconfig) randconfig: prepare $(objk)/conf - $(Q)$(objk)/conf -r $(Kconfig) + $(LIBPAYLOAD_CONFIG_PRE) + $(objk)/conf -r $(LIBCONFIG_PATH)/Config.in + $(LIBPAYLOAD_CONFIG_POST) + $(objk)/conf -r $(Kconfig) allyesconfig: prepare $(objk)/conf - $(Q)$(objk)/conf -y $(Kconfig) + $(LIBPAYLOAD_CONFIG_PRE) + $(objk)/conf -y $(LIBCONFIG_PATH)/Config.in + $(LIBPAYLOAD_CONFIG_POST) + $(objk)/conf -y $(Kconfig) allnoconfig: prepare $(objk)/conf - $(Q)$(objk)/conf -n $(Kconfig) + $(LIBPAYLOAD_CONFIG_PRE) + $(objk)/conf -n $(LIBCONFIG_PATH)/Config.in + $(LIBPAYLOAD_CONFIG_POST) + $(objk)/conf -n $(Kconfig) allmodconfig: prepare $(objk)/conf - $(Q)$(objk)/conf -m $(Kconfig) + $(LIBPAYLOAD_CONFIG_PRE) + $(objk)/conf -m $(LIBCONFIG_PATH)/Config.in + $(LIBPAYLOAD_CONFIG_POST) + $(objk)/conf -m $(Kconfig) defconfig: prepare $(objk)/conf + $(LIBPAYLOAD_CONFIG_PRE) ifeq ($(KBUILD_DEFCONFIG),) - $(Q)$(objk)/conf -d $(Kconfig) + $(objk)/conf -D $(LIBCONFIG_PATH)/configs/defconfig $(LIBCONFIG_PATH)/Config.in else @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" - $(Q)$(objk)/conf -D $(KBUILD_DEFCONFIG) $(Kconfig) + $(objk)/conf -D $(LIBCONFIG_PATH)/$(KBUILD_DEFCONFIG) $(LIBCONFIG_PATH)/Config.in +endif + $(LIBPAYLOAD_CONFIG_POST) +ifeq ($(KBUILD_DEFCONFIG),) + $(objk)/conf -d $(Kconfig) +else + @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'" + $(objk)/conf -D $(KBUILD_DEFCONFIG) $(Kconfig) endif %_defconfig: prepare $(objk)/conf - $(Q)$(objk)/conf -D configs/$@ $(Kconfig) + $(LIBPAYLOAD_CONFIG_PRE) + $(objk)/conf -D $(LIBCONFIG_PATH)/configs/$@ $(LIBCONFIG_PATH)/Config.in + $(LIBPAYLOAD_CONFIG_POST) + $(objk)/conf -D configs/$@ $(Kconfig) + +endif # "FATAL" # Help text used by make help help: @@ -293,7 +196,7 @@ clean-files += config.pot coreinfo.pot PHONY += $(objk)/dochecklxdialog $(addprefix $(obj)/,$(lxdialog)): $(objk)/dochecklxdialog $(objk)/dochecklxdialog: - $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES) + $(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES) always := dochecklxdialog @@ -438,46 +341,46 @@ endif $(objk)/qconf: $(patsubst %,$(objk)/%,$(qconf-cxxobjs)) \ $(patsubst %,$(objk)/%,$(qconf-objs)) - $(Q)$(HOSTCXX) $(HOSTCXXFLAGS) $(HOSTLOADLIBES_qconf) -o $@ $^ + $(HOSTCXX) $(HOSTCXXFLAGS) $(HOSTLOADLIBES_qconf) -o $@ $^ $(objk)/gconf: $(patsubst %,$(objk)/%,$(gconf-objs)) - $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOSTLOADLIBES_gconf) -o $@ $^ + $(HOSTCC) $(HOSTCFLAGS) $(HOSTLOADLIBES_gconf) -o $@ $^ $(objk)/mconf: $(patsubst %,$(objk)/%,$(mconf-objs)) - $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES) -o $@ $^ + $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES) -o $@ $^ $(objk)/conf: $(patsubst %,$(objk)/%,$(conf-objs)) - $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -o $@ $^ + $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -o $@ $^ $(objk)/mconf.o: $(srck)/mconf.c - $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $< + $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $< $(objk)/conf.o: $(srck)/conf.c - $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $< + $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $< $(objk)/regex.o: $(srck)/regex.c $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -DHAVE_STRING_H -c -o $@ $< $(objk)/zconf.tab.o: $(objk)/zconf.tab.c $(objk)/lex.zconf.c \ $(objk)/zconf.hash.c - $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $(objk)/zconf.tab.c + $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) -c -o $@ $(objk)/zconf.tab.c $(objk)/kconfig_load.o: $(srck)/kconfig_load.c $(objk)/lkc_defs.h - $(Q)$(HOSTCC) $(HOSTCFLAGS) -c -o $@ $< + $(HOSTCC) $(HOSTCFLAGS) -c -o $@ $< $(objk)/qconf.o: $(srck)/qconf.cc $(objk)/qconf.moc $(objk)/lkc_defs.h - $(Q)$(HOSTCXX) $(HOSTCXXFLAGS) $(HOSTCXXFLAGS_qconf.o) -c -o $@ $< + $(HOSTCXX) $(HOSTCXXFLAGS) $(HOSTCXXFLAGS_qconf.o) -c -o $@ $< $(objk)/gconf.o: $(srck)/gconf.c $(objk)/lkc_defs.h - $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOSTCFLAGS_gconf.o) -c -o $@ $< + $(HOSTCC) $(HOSTCFLAGS) $(HOSTCFLAGS_gconf.o) -c -o $@ $< $(objk)/%.moc: $(srck)/%.h - $(Q)$(KC_QT_MOC) -i $< -o $@ + $(KC_QT_MOC) -i $< -o $@ $(objk)/lkc_defs.h: $(srck)/lkc_proto.h - $(Q)sed < $< > $@ 's/P($[^,]*$,.*/#define \1 (\*\1_p)/' + sed < $< > $@ 's/P($[^,]*$,.*/#define \1 (\*\1_p)/' $(objk)/lex.zconf.c: $(srck)/lex.zconf.c_shipped - $(Q)cp $< $@ + cp $< $@ $(objk)/zconf.hash.c: $(srck)/zconf.hash.c_shipped - $(Q)cp $< $@ + cp $< $@ $(objk)/zconf.tab.c: $(srck)/zconf.tab.c_shipped - $(Q)cp $< $@ + cp $< $@ $(objk)/lxdialog/lxdialog: $(objk)/dochecklxdialog \ $(patsubst %,$(objk)/lxdialog/%,$(lxdialog)) - $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES) \ + $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES) \ $(patsubst %,$(objk)/lxdialog/%,$(lxdialog)) -o $@ $(objk)/lxdialog/%.o: $(srck)/lxdialog/%.c - $(Q)$(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $^ -c -o $@ + $(HOSTCC) $(HOSTCFLAGS) $(HOST_EXTRACFLAGS) $^ -c -o $@

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot September 2011