forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
kbuild: fix typos (s/bin_shipped/bin.o_shipped/) in Documentation
kbuild: add a symlink to the source for separate objdirs
kconfig: add script to manipulate .config files on the command line
kbuild: reintroduce ALLSOURCE_ARCHS support for tags/cscope
bootchart: improve output based on Dave Jones' feedback
fix modules_install via NFS
qnx: include <linux/types.h> for definitions of __[us]{8,16,32,64} types- Loading branch information
Showing
13 changed files
with
194 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,4 +3,3 @@ | |
| *.bin | ||
| *.csp | ||
| *.dsp | ||
| ihex2fw | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,7 @@ | ||
| # | ||
| # Generated files | ||
| # | ||
| ihex2fw | ||
| conmakehash | ||
| kallsyms | ||
| pnmtologo | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,150 @@ | ||
| #!/bin/bash | ||
| # Manipulate options in a .config file from the command line | ||
|
|
||
| usage() { | ||
| cat >&2 <<EOL | ||
| Manipulate options in a .config file from the command line. | ||
| Usage: | ||
| config options command ... | ||
| commands: | ||
| --enable|-e option Enable option | ||
| --disable|-d option Disable option | ||
| --module|-m option Turn option into a module | ||
| --state|-s option Print state of option (n,y,m,undef) | ||
| --enable-after|-E beforeopt option | ||
| Enable option directly after other option | ||
| --disable-after|-D beforeopt option | ||
| Disable option directly after other option | ||
| --module-after|-M beforeopt option | ||
| Turn option into module directly after other option | ||
| commands can be repeated multiple times | ||
| options: | ||
| --file .config file to change (default .config) | ||
| config doesn't check the validity of the .config file. This is done at next | ||
| make time. | ||
| The options need to be already in the file before they can be changed, | ||
| but sometimes you can cheat with the --*-after options. | ||
| EOL | ||
| exit 1 | ||
| } | ||
|
|
||
| checkarg() { | ||
| ARG="$1" | ||
| if [ "$ARG" = "" ] ; then | ||
| usage | ||
| fi | ||
| case "$ARG" in | ||
| CONFIG_*) | ||
| ARG="${ARG/CONFIG_/}" | ||
| ;; | ||
| esac | ||
| ARG="`echo $ARG | tr a-z A-Z`" | ||
| } | ||
|
|
||
| replace() { | ||
| sed -i -e "$@" $FN | ||
| } | ||
|
|
||
| if [ "$1" = "--file" ]; then | ||
| FN="$2" | ||
| if [ "$FN" = "" ] ; then | ||
| usage | ||
| fi | ||
| shift | ||
| shift | ||
| else | ||
| FN=.config | ||
| fi | ||
|
|
||
| while [ "$1" != "" ] ; do | ||
| CMD="$1" | ||
| shift | ||
| case "$CMD" in | ||
| --enable|-e) | ||
| checkarg "$1" | ||
| replace "s/# CONFIG_$ARG is not set/CONFIG_$ARG=y/" | ||
| shift | ||
| ;; | ||
|
|
||
| --disable|-d) | ||
| checkarg "$1" | ||
| replace "s/CONFIG_$ARG=[my]/# CONFIG_$ARG is not set/" | ||
| shift | ||
| ;; | ||
|
|
||
| --module|-m) | ||
| checkarg "$1" | ||
| replace "s/CONFIG_$ARG=y/CONFIG_$ARG=m/" \ | ||
| -e "s/# CONFIG_$ARG is not set/CONFIG_$ARG=m/" | ||
| shift | ||
| ;; | ||
|
|
||
| --state|-s) | ||
| checkarg "$1" | ||
| if grep -q "# CONFIG_$ARG is not set" $FN ; then | ||
| echo n | ||
| else | ||
| V="$(grep "^CONFIG_$ARG=" $FN)" | ||
| if [ $? != 0 ] ; then | ||
| echo undef | ||
| else | ||
| V="${V/CONFIG_$ARG=/}" | ||
| V="${V/\"/}" | ||
| echo "$V" | ||
| fi | ||
| fi | ||
| shift | ||
| ;; | ||
|
|
||
| --enable-after|-E) | ||
| checkarg "$1" | ||
| A=$ARG | ||
| checkarg "$2" | ||
| B=$ARG | ||
| replace "/CONFIG_$A=[my]/aCONFIG_$B=y" \ | ||
| -e "/# CONFIG_$ARG is not set/a/CONFIG_$ARG=y" \ | ||
| -e "s/# CONFIG_$ARG is not set/CONFIG_$ARG=y/" | ||
| shift | ||
| shift | ||
| ;; | ||
|
|
||
| --disable-after|-D) | ||
| checkarg "$1" | ||
| A=$ARG | ||
| checkarg "$2" | ||
| B=$ARG | ||
| replace "/CONFIG_$A=[my]/a# CONFIG_$B is not set" \ | ||
| -e "/# CONFIG_$ARG is not set/a/# CONFIG_$ARG is not set" \ | ||
| -e "s/CONFIG_$ARG=[my]/# CONFIG_$ARG is not set/" | ||
| shift | ||
| shift | ||
| ;; | ||
|
|
||
| --module-after|-M) | ||
| checkarg "$1" | ||
| A=$ARG | ||
| checkarg "$2" | ||
| B=$ARG | ||
| replace "/CONFIG_$A=[my]/aCONFIG_$B=m" \ | ||
| -e "/# CONFIG_$ARG is not set/a/CONFIG_$ARG=m" \ | ||
| -e "s/CONFIG_$ARG=y/CONFIG_$ARG=m/" \ | ||
| -e "s/# CONFIG_$ARG is not set/CONFIG_$ARG=m/" | ||
| shift | ||
| shift | ||
| ;; | ||
|
|
||
| # undocumented because it ignores --file (fixme) | ||
| --refresh) | ||
| yes "" | make oldconfig | ||
| ;; | ||
|
|
||
| *) | ||
| usage | ||
| ;; | ||
| esac | ||
| done | ||
|
|
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters