X-Git-Url: https://jxself.org/git/?p=carl9170fw.git;a=blobdiff_plain;f=config%2Fconfdata.c;fp=config%2Fconfdata.c;h=cc18bc408397812ea125d1009da576a3cd897ec7;hp=a124a25e899fde96872ff0a9952e079070339d44;hb=0ae900bef52e9b911e1c262900f9532f8acbe58d;hpb=509099606b6c5cb34249fc06e289adc5a90cbe74

diff --git a/config/confdata.c b/config/confdata.c
index a124a25..cc18bc4 100644
--- a/config/confdata.c
+++ b/config/confdata.c
@@ -756,25 +756,6 @@ static struct conf_printer header_printer_cb =
 	.print_comment = header_print_comment,
 };
 
-/*
- * Tristate printer
- *
- * This printer is used when generating the `include/generated/tristate.conf' file.
- */
-static void
-tristate_print_symbol(FILE *fp, struct symbol *sym, const char *value, void *arg)
-{
-
-	if (sym->type == S_TRISTATE && *value != 'n')
-		fprintf(fp, "%s%s=%c\n", CONFIG_, sym->name, (char)toupper(*value));
-}
-
-static struct conf_printer tristate_printer_cb =
-{
-	.print_symbol = tristate_print_symbol,
-	.print_comment = kconfig_print_comment,
-};
-
 static void conf_write_symbol(FILE *fp, struct symbol *sym,
 			      struct conf_printer *printer, void *printer_arg)
 {
@@ -1108,7 +1089,7 @@ int conf_write_autoconf(int overwrite)
 	struct symbol *sym;
 	const char *name;
 	const char *autoconf_name = conf_get_autoconfig_name();
-	FILE *out, *tristate, *out_h, *out_c;
+	FILE *out, *out_h, *out_c;
 	int i;
 
 	if (!overwrite && is_present(autoconf_name))
@@ -1123,30 +1104,20 @@ int conf_write_autoconf(int overwrite)
 	if (!out)
 		return 1;
 
-	tristate = fopen(".tmpconfig_tristate", "w");
-	if (!tristate) {
-		fclose(out);
-		return 1;
-	}
-
 	out_h = fopen(".tmpconfig.h", "w");
 	if (!out_h) {
 		fclose(out);
-		fclose(tristate);
 		return 1;
 	}
 
 	out_c = fopen(".tmpconfig.cmake", "w");
 	if (!out_c) {
 		fclose(out);
-		fclose(tristate);
 		fclose(out_h);
 	}
 
 	conf_write_heading(out, &kconfig_printer_cb, NULL);
 
-	conf_write_heading(tristate, &tristate_printer_cb, NULL);
-
 	conf_write_heading(out_h, &header_printer_cb, NULL);
 
 	conf_write_heading(out_c, &kconfig_printer_cmake_cb, NULL);
@@ -1156,17 +1127,14 @@ int conf_write_autoconf(int overwrite)
 		if (!(sym->flags & SYMBOL_WRITE) || !sym->name)
 			continue;
 
-		/* write symbol to auto.conf, tristate and header files */
+		/* write symbol to auto.conf and header files */
 		conf_write_symbol(out, sym, &kconfig_printer_cb, (void *)1);
 
-		conf_write_symbol(tristate, sym, &tristate_printer_cb, (void *)1);
-
 		conf_write_symbol(out_h, sym, &header_printer_cb, NULL);
 
 		conf_write_symbol(out_c, sym, &kconfig_printer_cmake_cb, NULL);
 	}
 	fclose(out);
-	fclose(tristate);
 	fclose(out_h);
 	fclose(out_c);
 
@@ -1178,14 +1146,6 @@ int conf_write_autoconf(int overwrite)
 	if (rename(".tmpconfig.h", name))
 		return 1;
 
-	name = getenv("KCONFIG_TRISTATE");
-	if (!name)
-		name = "include/generated/tristate.conf";
-	if (make_parent_dir(name))
-		return 1;
-	if (rename(".tmpconfig_tristate", name))
-		return 1;
-
 	if (make_parent_dir(autoconf_name))
 		return 1;