kconfig: Allow architectures to select board specific configs

Sam Ravnborg
2003-09-10T19:20:18Z

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.1269 -> 1.1270
# scripts/kconfig/conf.c 1.9 -> 1.10
# scripts/kconfig/Makefile 1.9 -> 1.10
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/09/10 sam@mars.ravnborg.org 1.1270
# kconfig: Allow architectures to select board specific configs
#
# This patch introduces the framework required for architectures to supply
# several independent configurations. Three architectures does this today:
# ppc, ppc64 and arm.
# The infrastructure provided here requires the files to be located in
# the following directory:
# arch/$(ARCH)/configs
# The file shall be named <board>_defconfig
#
# To select the configuration for ppc/gemini simply issue the following command:
# make gemini_defconfig
# This will generate a valid configuration.
#
# ppc and ppc64 already comply to the above requirements, arm needs some
# trivial updates.
# --------------------------------------------
#
diff -Nru a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
--- a/scripts/kconfig/Makefile Wed Sep 10 21:15:40 2003
+++ b/scripts/kconfig/Makefile Wed Sep 10 21:15:40 2003
@@ -40,6 +40,9 @@
defconfig: $(obj)/conf
$< -d arch/$(ARCH)/Kconfig

+%_defconfig: $(obj)/conf
+ $(Q)$< -D arch/$(ARCH)/configs/$@ arch/$(ARCH)/Kconfig
+
# Help text used by make help
help:
@echo ' oldconfig - Update current config utilising a line-oriented program'
diff -Nru a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
--- a/scripts/kconfig/conf.c Wed Sep 10 21:15:40 2003
+++ b/scripts/kconfig/conf.c Wed Sep 10 21:15:40 2003
@@ -26,6 +26,7 @@
set_no,
set_random
} input_mode = ask_all;
+char *defconfig_file;

static int indent = 1;
static int valid_stdin = 1;
@@ -483,11 +484,12 @@

int main(int ac, char **av)
{
+ int i = 1;
const char *name;
struct stat tmpstat;

- if (ac > 1 && av[1][0] == '-') {
- switch (av[1][1]) {
+ if (ac > i && av[i][0] == '-') {
+ switch (av[i++][1]) {
case 'o':
input_mode = ask_new;
break;
@@ -498,6 +500,15 @@
case 'd':
input_mode = set_default;
break;
+ case 'D':
+ input_mode = set_default;
+ defconfig_file = av[i++];
+ if (!defconfig_file) {
+ printf("%s: No default config file specified\n",
+ av[0]);
+ exit(1);
+ }
+ break;
case 'n':
input_mode = set_no;
break;
@@ -516,18 +527,21 @@
printf("%s [-o|-s] config\n", av[0]);
exit(0);
}
- name = av[2];
- } else
- name = av[1];
+ }
+ name = av[i];
+ if (!name) {
+ printf("%s: Kconfig file missing\n", av[0]);
+ }
conf_parse(name);
//zconfdump(stdout);
switch (input_mode) {
case set_default:
- name = conf_get_default_confname();
- if (conf_read(name)) {
+ if (!defconfig_file)
+ defconfig_file = conf_get_default_confname();
+ if (conf_read(defconfig_file)) {
printf("***\n"
"*** Can't find default configuration \"%s\"!\n"
- "***\n", name);
+ "***\n", defconfig_file);
exit(1);
}
break;