aboutsummaryrefslogtreecommitdiff
path: root/scripts/kconfig/merge_config.sh
AgeCommit message (Expand)Author
2019-09-04merge_config.sh: ignore unwanted grep errorsGuillaume Tucker
2019-08-22merge_config.sh: Check error codes from makeMark Brown
2018-12-28kconfig: convert to SPDX License IdentifierMasahiro Yamada
2018-11-15scripts/kconfig/merge_config: don't redefine 'y' to 'm'Anders Roxell
2018-11-11kconfig: merge_config: avoid false positive matches from comment linesMasahiro Yamada
2018-11-02merge_config.sh: Allow to define config prefixPetr Vorel
2015-10-14kconfig/merge_config.sh: Accept a single fileGabriel de Perthuis
2015-10-14kconfig/merge_config.sh: Support KCONFIG_CONFIGGabriel de Perthuis
2015-08-20merge_config.sh: exit on missing input filesSam Bobroff
2015-03-24merge_config.sh: rename MAKE to RUNMAKEMasahiro Yamada
2015-03-24merge_config.sh: improve indentationMasahiro Yamada
2015-03-24kbuild: mergeconfig: move an error check to merge_config.shMasahiro Yamada
2015-02-25kconfig: fix a misspelling in scripts/kconfig/merge_config.shMasahiro Yamada
2015-01-07merge_config.sh: Display usage if given too few argumentsOlof Johansson
2013-04-10merge_config.sh: Avoid creating unnessary source softlinksJohn Stultz
2012-12-09merge_config.sh: Add option to specify output dirZhangfei Gao
2012-03-30merge_config.sh: Add option to display redundant configsJohn Stultz
2012-03-30merge_config.sh: Set execute bitJohn Stultz
2012-03-24merge_config.sh: Use the first file as the initial configJosh Boyer
2012-01-14merge_config.sh: fix bug in final checkJohn Stultz
2012-01-14merge_config.sh: whitespace cleanupDarren Hart
2012-01-14merge_config.sh: use signal names compatible with dash and bashDarren Hart
2012-01-14kconfig: add merge_config.sh scriptjohn stultz