Eric Lee / smarc-fsl-linux-kernel

17 Jan, 2012

1 commit

  • 287b901dc   Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild ... Browse Code »

    * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
    menuconfig: fix a regression when canceling the prompt dialog at exit
    kbuild: Fix compiler warning with assertion when calling 'fwrite'
    Improve update-po-config output
    menuconfig: let make not report error when not save configuration
    merge_config.sh: fix bug in final check
    merge_config.sh: whitespace cleanup
    merge_config.sh: use signal names compatible with dash and bash
    kconfig: add merge_config.sh script
    kconfig: use xfwrite wrapper function to silence warnings
    kconfig: fix set but not used warnings
    kconfig: fix warnings by specifing format arguments

    Linus Torvalds
     

15 Jan, 2012

1 commit

19 Dec, 2011

1 commit

  • fa0ad6575   kconfig: adapt update-po-config to new UML layout ... Browse Code »

    Commit 5c48b108 ("um: take arch/um/sys-x86 to arch/x86/um") broke the
    make target update-po-config, as its symlink trick (again) fails.
    (Previous breakage was fixed with commit bdc69ca4 ("kconfig: change
    update-po-config to reflect new layout of arch/um").)

    The new UML layout allows to drop the symlick trick entirely. And if,
    one day, another architecture supports UML too, that should now work
    without again breaking this make target.

    Signed-off-by: Paul Bolle
    Signed-off-by: Michal Marek

    Paul Bolle
     

08 Aug, 2011

3 commits

30 Jul, 2011

1 commit

  • 1d3fe4a75   Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 ... Browse Code »

    * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (25 commits)
    kconfig: Introduce IS_ENABLED(), IS_BUILTIN() and IS_MODULE()
    xconfig: Abort close if configuration cannot be saved
    kconfig: fix missing "0x" prefix from S_HEX symbol in autoconf.h
    kconfig/nconf: remove useless conditionnal
    kconfig/nconf: prevent segfault on empty menu
    kconfig/nconf: use the generic menu_get_ext_help()
    nconfig: Avoid Wunused-but-set warning
    kconfig/conf: mark xfgets() private
    kconfig: remove pending prototypes for kconfig_load()
    kconfig/conf: add command line options' description
    kconfig/conf: reduce the scope of `defconfig_file'
    kconfig: use calloc() for expr allocation
    kconfig: introduce specialized printer
    kconfig: do not overwrite symbol direct dependency in assignment
    kconfig/gconf: silent missing prototype warnings
    kconfig/gconf: kill deadcode
    kconfig: nuke LKC_DIRECT_LINK cruft
    kconfig: nuke reference to SWIG
    kconfig: add missing inclusion
    kconfig: add missing inclusion
    ...

    Fix up conflicts in scripts/kconfig/Makefile

    Linus Torvalds
     

10 Jun, 2011

3 commits

07 Jun, 2011

2 commits

29 Apr, 2011

7 commits

28 Sep, 2010

1 commit

  • 0455029be   Merge branch 'kbuild/kconfig/kbuild-generic-v7' of http://github.com/lacombar/li… ... Browse Code »

    …nux-2.6 into kbuild/kconfig

    * 'kbuild/kconfig/kbuild-generic-v7' of http://github.com/lacombar/linux-2.6:
    kbuild: migrate all arch to the kconfig mainmenu upgrade
    kconfig: expand file names
    kconfig: use the file's name of sourced file
    kconfig: constify file name
    kconfig: don't emit warning upon rootmenu's prompt redefinition
    kconfig: replace KERNELVERSION usage by the mainmenu's prompt
    kconfig: delay gconf window initialization
    kconfig: expand by default the rootmenu's prompt
    kconfig: add a symbol string expansion helper
    kconfig: regen parser
    kconfig: implement the `mainmenu' directive
    kconfig: allow PACKAGE to be defined on the compiler's command-line
    kconfig: rephrase help texts/comments not to include the package name
    kconfig: allow build-time definition of the internal config prefix
    kconfig: rephrase help text not to mention the internal prefix
    kconfig: replace a `switch()' statement by a more flexible `if()' statement

    Michal Marek
     

20 Sep, 2010

1 commit

13 Sep, 2010

2 commits

01 Sep, 2010

1 commit

  • 133c5f7c1   kconfig qconf: port to QT4 ... Browse Code »

    A straight forward port to QT4 using qt3to4 and compiling against
    qt3support

    * Use pkg-config to detect QT4 which is hopefully portable enough
    * If no QT4, QT3 will by tried instead
    * Classes renamed using qt3to4
    * If build using QT3 renamed to QT3 class names using defines
    * ConfigInfoView::menu has to be renamed as QT4 moc strips struct from
    struct menu and creates a name conflict
    * QT2 support has been dropped
    * The hidden options inserted in 39a4897c1bb66e8a36043c105d7fd73d8b32b480
    are use in native API

    Signed-off-by: Alexander Stein
    Signed-off-by: Michal Marek

    Alexander Stein
     

26 Aug, 2010

1 commit

17 Aug, 2010

1 commit

  • 7080e47bb   kbuild: don't include `check-lxdialog' ldflags in global HOST_LOADLIBES ... Browse Code »

    On BSD systems, `check-lxdialog' would select -lcurses as the default
    curses library which would conflict with -lncurses at runtime: curses'
    compatible symbols are getting handled by the system's curses library while the
    ncurses-specific symbols are getting handled by the ports' ncurses.

    This fixes `nconf' segmentation fault on these systems.

    Signed-off-by: Arnaud Lacombe
    Signed-off-by: Michal Marek

    Arnaud Lacombe
     

04 Aug, 2010

1 commit

03 Aug, 2010

5 commits

  • 7cf3d73b4   kconfig: add savedefconfig ... Browse Code »

    savedefconfig will save a minimal config to a file
    named "defconfig".

    The config symbols are saved in the same order as
    they appear in the menu structure so it should
    be possible to map them to the relevant menus
    if desired.

    The implementation was tested against several minimal
    configs for arm which was created using brute-force.

    There was one regression related to default numbers
    which had their valid range further limited by another symbol.

    Sample:

    config FOO
    int "foo"
    default 4

    config BAR
    int "bar"
    range 0 FOO

    If FOO is set to 3 then BAR cannot take a value higher than 3.
    But the current implementation will set BAR equal to 4.

    This is seldomly used and the final configuration is OK,
    and the fix was non-trivial.
    So it was documented in the code and left as is.

    Signed-off-by: Sam Ravnborg
    Acked-by: Uwe Kleine-König
    Signed-off-by: Michal Marek

    Sam Ravnborg
     
  • 0748cb3e1   kconfig: add alldefconfig ... Browse Code »

    alldefconfig create a configuration with all values set
    to their default value (form the Kconfig files).

    This may be useful when we try to use more sensible default
    values and may also be used in combination with
    the minimal defconfigs.

    Signed-off-by: Sam Ravnborg
    Signed-off-by: Michal Marek

    Sam Ravnborg
     
  • 861b4ea4c   kconfig: change nonint_oldconfig to listnewconfig ... Browse Code »

    Rename to a name that better match the other kconfig targets.

    listnewconfig shall read as:

    - list new options compared to current configuration

    New options are now written to stdout so one can redirect the output.

    Do not exit with an error code if there is new options.

    These are feature changes compared to the original
    nonint_oldconfig - but as this feature has not yet been in a
    released kernel it should not matter.

    It is still possible to do:

    make listnewconfig
    lookup new config options in Kconfig*
    edit .config

    Signed-off-by: Sam Ravnborg
    Cc: Aristeu Rozanski
    Acked-by: Aristeu Rozanski
    Signed-off-by: Michal Marek

    Sam Ravnborg
     
  • ef61ca88c   kconfig: rename loose_nonint_oldconfig => oldnoconfig ... Browse Code »

    Rename target to something that fall more in line
    with the other kconfig targets.

    oldnoconfig shall read as:

    - read the old configuration and set all new options to no

    Signed-off-by: Sam Ravnborg
    Cc: Aristeu Rozanski
    Signed-off-by: Michal Marek

    Sam Ravnborg
     
  • 4062f1a4c   kconfig: use long options in conf ... Browse Code »

    The list of options supported by conf is growing
    and their abbreviation did not resemble anything usefull.

    So drop the single letter options in favour of long options.

    The long options are named equal to what we know from
    the make target.
    The internal implmentation was changed to match this,
    resulting in much more readable code.

    Support for short options is dropped - no one is supposed
    to call this program direct anyway.

    Signed-off-by: Sam Ravnborg
    Signed-off-by: Michal Marek

    Sam Ravnborg
     

05 Jun, 2010

1 commit

03 Jun, 2010

1 commit

  • cbab05f04   gconfig: fix build failure on fedora 13 ... Browse Code »

    Making gconfig fails on fedora 13 as the linker cannot resolve dlsym.

    Adding libdl to the link command fixes this.

    make shows this error :-
    /usr/bin/ld: scripts/kconfig/kconfig_load.o: undefined reference to symbol 'dlsym@@GLIBC_2.2.5'
    /usr/bin/ld: note: 'dlsym@@GLIBC_2.2.5' is defined in DSO /lib64/libdl.so.2 so try adding it to the linker command line
    /lib64/libdl.so.2: could not read symbols: Invalid operation

    tested on x86_64 fedora 13.

    Signed-off-by: Richard Kennedy
    Reviewed-by: WANG Cong
    Cc:
    Signed-off-by: Andrew Morton
    Signed-off-by: Michal Marek

    Richard Kennedy
     

02 Jun, 2010

1 commit

  • f0778c8c4   kconfig: introduce nonint_oldconfig and loose_nonint_oldconfig ... Browse Code »

    This patch has been around for a long time in Fedora and Red Hat Enterprise
    Linux kernels and it may be useful for others. The nonint_oldconfig target
    will fail and print the unset config options while loose_nonint_oldconfig will
    simply let the config option unset. They're useful in distro kernel packages
    where the config files are built using a combination of smaller config files.

    Arjan van de Ven wrote the initial nonint_config and Roland McGrath added the
    loose_nonint_oldconfig.

    Signed-off-by: Arjan van de Ven [defunct email]
    Whatevered-by: Kyle McMartin
    Acked-by: Arjan van de Ven
    Acked-by: Randy Dunlap
    Signed-off-by: Aristeu Rozanski
    [mmarek: whitespace fixes]
    Signed-off-by: Michal Marek

    Aristeu Rozanski
     

01 Jun, 2010

1 commit

  • 1f7389786   Merge branch 'for-35' of git://repo.or.cz/linux-kbuild ... Browse Code »

    * 'for-35' of git://repo.or.cz/linux-kbuild: (81 commits)
    kbuild: Revert part of e8d400a to resolve a conflict
    kbuild: Fix checking of scm-identifier variable
    gconfig: add support to show hidden options that have prompts
    menuconfig: add support to show hidden options which have prompts
    gconfig: remove show_debug option
    gconfig: remove dbg_print_ptype() and dbg_print_stype()
    kconfig: fix zconfdump()
    kconfig: some small fixes
    add random binaries to .gitignore
    kbuild: Include gen_initramfs_list.sh and the file list in the .d file
    kconfig: recalc symbol value before showing search results
    .gitignore: ignore *.lzo files
    headerdep: perlcritic warning
    scripts/Makefile.lib: Align the output of LZO
    kbuild: Generate modules.builtin in make modules_install
    Revert "kbuild: specify absolute paths for cscope"
    kbuild: Do not unnecessarily regenerate modules.builtin
    headers_install: use local file handles
    headers_check: fix perl warnings
    export_report: fix perl warnings
    ...

    Linus Torvalds
     

04 Feb, 2010

1 commit

03 Feb, 2010

1 commit

  • 615f0833a   kconfig: Add LSMOD=file to override the lsmod for localmodconfig ... Browse Code »

    Doing the following:

    make LSMOD=file localmodconfig

    Will make the streamline-config code use the given file instead of
    lsmod. If the file is an executable, it will execute it, otherwise
    it will read it as text.

    make LSMOD=/my/local/path/lsmod localmodconfig

    The above will execute the lsmod in /my/local/path instead of the
    lsmods that may be located elsewhere.

    make LSMOD=embedded_board_lsmod localmodconfig

    The above will read the "embedded_board_lsmod" as a text file. This
    is useful if you are doing a cross compile and need to run the
    config against modules that exist on an embedded device.

    Note, if the LSMOD= file does is not a path, it will add the
    path to the object directory. That is, the above example will look
    for "embedded_board_lsmod" in the directory that the binary will
    be built in (the O=dir directory).

    Signed-off-by: Steven Rostedt

    On branch config/linus

    Steven Rostedt
     

02 Feb, 2010

1 commit

  • 692d97c38   kconfig: new configuration interface (nconfig) ... Browse Code »

    This patch was inspired by the kernel projects page, where an ncurses
    replacement for menuconfig was mentioned (by Sam Ravnborg).

    Building on menuconfig, this patch implements a more modern look
    interface using ncurses and ncurses' satellite libraries (menu, panel,
    form). The implementation does not depend on lxdialog, which is
    currently distributed with the kernel.

    Signed-off-by: Nir Tzachar
    Signed-off-by: Michal Marek

    nir.tzachar@gmail.com
     

07 Jan, 2010

1 commit

  • 17263baf9   kconfig: Create include/generated for localmodconfig ... Browse Code »

    If someone downloads a brand new kernel and runs localmodconfig or
    localyesconfig, the ending result will report:

    *** Error during update of the kernel configuration.

    This is because localmodconfig and localyesconfig must create the
    include/generated directory to place the autoconf.h file.

    Signed-off-by: Steven Rostedt

    Steven Rostedt