summaryrefslogtreecommitdiff
path: root/scripts/kconfig/merge_config.sh
AgeCommit message (Expand)AuthorFilesLines
2023-03-23scripts: merge_config: Fix typo in variable name.Mirsad Goran Todorovac1-1/+1
2023-02-13scripts: merge_config: Add option to suppress warning on overridesMark Brown1-9/+16
2021-08-10scripts: merge_config: add strict mode to fail upon any redefinitionMatthias Maennich1-0/+15
2019-09-04merge_config.sh: ignore unwanted grep errorsGuillaume Tucker1-1/+1
2019-08-21merge_config.sh: Check error codes from makeMark Brown1-5/+5
2018-12-28kconfig: convert to SPDX License IdentifierMasahiro Yamada1-9/+2
2018-11-15scripts/kconfig/merge_config: don't redefine 'y' to 'm'Anders Roxell1-8/+29
2018-11-11kconfig: merge_config: avoid false positive matches from comment linesMasahiro Yamada1-3/+4
2018-11-01merge_config.sh: Allow to define config prefixPetr Vorel1-1/+5
2015-10-14kconfig/merge_config.sh: Accept a single fileGabriel de Perthuis1-1/+1
2015-10-14kconfig/merge_config.sh: Support KCONFIG_CONFIGGabriel de Perthuis1-4/+12
2015-08-20merge_config.sh: exit on missing input filesSam Bobroff1-0/+4
2015-03-24merge_config.sh: rename MAKE to RUNMAKEMasahiro Yamada1-3/+3
2015-03-24merge_config.sh: improve indentationMasahiro Yamada1-8/+6
2015-03-24kbuild: mergeconfig: move an error check to merge_config.shMasahiro Yamada1-0/+5
2015-02-25kconfig: fix a misspelling in scripts/kconfig/merge_config.shMasahiro Yamada1-1/+1
2015-01-07merge_config.sh: Display usage if given too few argumentsOlof Johansson1-0/+5
2013-04-10merge_config.sh: Avoid creating unnessary source softlinksJohn Stultz1-1/+9
2012-12-09merge_config.sh: Add option to specify output dirZhangfei Gao1-4/+16
2012-03-30merge_config.sh: Add option to display redundant configsJohn Stultz1-0/+9
2012-03-30merge_config.sh: Set execute bitJohn Stultz1-0/+0
2012-03-25merge_config.sh: Use the first file as the initial configJosh Boyer1-1/+5
2012-01-15merge_config.sh: fix bug in final checkJohn Stultz1-2/+2
2012-01-15merge_config.sh: whitespace cleanupDarren Hart1-2/+2
2012-01-15merge_config.sh: use signal names compatible with dash and bashDarren Hart1-1/+1
2012-01-15kconfig: add merge_config.sh scriptjohn stultz1-0/+117