aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README23
-rw-r--r--scripts/kconfig/conf.c3
2 files changed, 24 insertions, 2 deletions
diff --git a/README b/README
index 05e055530bbb..3e264723b863 100644
--- a/README
+++ b/README
@@ -165,10 +165,31 @@ CONFIGURING the kernel:
165 "make xconfig" X windows (Qt) based configuration tool. 165 "make xconfig" X windows (Qt) based configuration tool.
166 "make gconfig" X windows (Gtk) based configuration tool. 166 "make gconfig" X windows (Gtk) based configuration tool.
167 "make oldconfig" Default all questions based on the contents of 167 "make oldconfig" Default all questions based on the contents of
168 your existing ./.config file. 168 your existing ./.config file and asking about
169 new config symbols.
169 "make silentoldconfig" 170 "make silentoldconfig"
170 Like above, but avoids cluttering the screen 171 Like above, but avoids cluttering the screen
171 with questions already answered. 172 with questions already answered.
173 "make defconfig" Create a ./.config file by using the default
174 symbol values from arch/$ARCH/defconfig.
175 "make allyesconfig"
176 Create a ./.config file by setting symbol
177 values to 'y' as much as possible.
178 "make allmodconfig"
179 Create a ./.config file by setting symbol
180 values to 'm' as much as possible.
181 "make allnoconfig" Create a ./.config file by setting symbol
182 values to 'n' as much as possible.
183 "make randconfig" Create a ./.config file by setting symbol
184 values to random values.
185
186 The allyesconfig/allmodconfig/allnoconfig/randconfig variants can
187 also use the environment variable KCONFIG_ALLCONFIG to specify a
188 filename that contains config options that the user requires to be
189 set to a specific value. If KCONFIG_ALLCONFIG=filename is not used,
190 "make *config" checks for a file named "all{yes/mod/no/random}.config"
191 for symbol values that are to be forced. If this file is not found,
192 it checks for a file named "all.config" to contain forced values.
172 193
173 NOTES on "make config": 194 NOTES on "make config":
174 - having unnecessary drivers will make the kernel bigger, and can 195 - having unnecessary drivers will make the kernel bigger, and can
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index ae5ab981bb1d..8012d1076876 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -5,6 +5,7 @@
5 5
6#include <ctype.h> 6#include <ctype.h>
7#include <stdlib.h> 7#include <stdlib.h>
8#include <stdio.h>
8#include <string.h> 9#include <string.h>
9#include <unistd.h> 10#include <unistd.h>
10#include <time.h> 11#include <time.h>
@@ -531,7 +532,7 @@ int main(int ac, char **av)
531 break; 532 break;
532 case 'h': 533 case 'h':
533 case '?': 534 case '?':
534 printf("%s [-o|-s] config\n", av[0]); 535 fprintf(stderr, "See README for usage info\n");
535 exit(0); 536 exit(0);
536 } 537 }
537 } 538 }