Skip to contentSkip to conversation

kconfig: update to Linux 5.13-rc1

PATCH Applied Masahiro Yamada 2 participants 4 messages May 11, 2021 – May 22, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kconfig: update to Linux 5.13-rc1

The previous sync was Linux 5.9-rc2.

Resync scripts/kconfig/ with Linux 5.13-rc1.

Highlights:

- make header names in include/config/ and CONFIG symbols match (scripts/basic/fixdep.c was adjusted)

- remove all 'option' syntax
(common/Kconfig was adjusted)

- introduce KCONFIG_DEFCONFIG_LIST instead of 'option defconfig_list'

- bug fixes and cleanups of nconfig

- drop Qt4 support from xconfig

- bug fixes, improvements, cleanups of xconfig

- print a short log for syncconfig

---

 Makefile                                      |  13 +-
 common/Kconfig                                |   7 +-
 scripts/basic/.gitignore                      |   2 +-
 scripts/basic/fixdep.c                        |  45 +-
 scripts/kconfig/.gitignore                    |  13 +-
 scripts/kconfig/Makefile                      |  73 ++-
 scripts/kconfig/conf.c                        | 440 +++++++++++----
 scripts/kconfig/confdata.c                    | 278 ++--------
 scripts/kconfig/expr.h                        |   6 -
 scripts/kconfig/gconf.c                       |  15 +-
 scripts/kconfig/internal.h                    |   9 +
 scripts/kconfig/lexer.l                       |   4 -
 scripts/kconfig/lkc.h                         |  66 ++-
 scripts/kconfig/lkc_proto.h                   |  15 +-
 scripts/kconfig/lxdialog/util.c               |   4 +-
 scripts/kconfig/mconf-cfg.sh                  |   4 +-
 scripts/kconfig/mconf.c                       |  15 +-
 scripts/kconfig/menu.c                        |  23 +-
 scripts/kconfig/nconf.c                       |  59 +-
 scripts/kconfig/nconf.gui.c                   | 284 ++++------
 scripts/kconfig/nconf.h                       |  51 +-
 scripts/kconfig/parser.y                      |  27 +-
 scripts/kconfig/preprocess.c                  |   2 +-
 scripts/kconfig/qconf-cfg.sh                  |  14 +-
 scripts/kconfig/qconf.cc                      | 517 ++++++++----------
 scripts/kconfig/qconf.h                       |  77 +--
 scripts/kconfig/streamline_config.pl          |   9 +-
 scripts/kconfig/symbol.c                      |   5 +-
 scripts/kconfig/tests/choice/Kconfig          |   2 +-
 .../tests/choice_value_with_m_dep/Kconfig     |   2 +-
 scripts/kconfig/tests/conftest.py             |   4 +
 scripts/kconfig/tests/inter_choice/Kconfig    |   2 +-
 32 files changed, 932 insertions(+), 1155 deletions(-)
 create mode 100644 scripts/kconfig/internal.h
Makefile +7 -6
index db1690bac..25c64232e 100644
@@ -352,9 +352,6 @@ KCONFIG_CONFIG	?= .config
 
 export KCONFIG_CONFIG
 
-# Default file for 'make defconfig'. This may be overridden by arch-Makefile.
-export KBUILD_DEFCONFIG := defconfig
-
 # SHELL used by kbuild
 CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
 	  else if [ -x /bin/bash ]; then echo /bin/bash; \
@@ -596,8 +593,11 @@ $(KCONFIG_CONFIG):
 # This exploits the 'multi-target pattern rule' trick.
 # The syncconfig should be executed only once to make all the targets.
 # (Note: use the grouped target '&:' when we bump to GNU Make 4.3)
-%/auto.conf %/auto.conf.cmd: $(KCONFIG_CONFIG)
-	$(Q)$(MAKE) -f $(srctree)/Makefile syncconfig
+quiet_cmd_syncconfig = SYNC    $@
+      cmd_syncconfig = $(MAKE) -f $(srctree)/Makefile syncconfig
+
+%/config/auto.conf %/config/auto.conf.cmd %/generated/autoconf.h: $(KCONFIG_CONFIG)
+	+$(call cmd,syncconfig)
 else # !may-sync-config
 # External modules and some install targets need include/generated/autoconf.h
 # and include/config/auto.conf but do not care if they are up-to-date.
@@ -941,7 +941,8 @@ scripts: scripts_basic
 PHONY += prepare archprepare prepare0
 
 archprepare: outputmakefile scripts_basic include/config/kernel.release \
-	$(version_h) include/generated/utsrelease.h include/config.h
+	$(version_h) include/generated/utsrelease.h include/config.h \
+	include/generated/autoconf.h
 
 prepare0: archprepare FORCE
 ifneq ($(KBUILD_MODULES),)
common/Kconfig +1 -6
index bddf802d3..3bbbc6e26 100644
@@ -1,8 +1,3 @@
-config DEFCONFIG_LIST
-	string
-	option defconfig_list
-	default "arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)"
-
 config GREGORIAN_CALENDER
 	bool
 
@@ -337,7 +332,7 @@ config MODULES
 	depends on HAS_MODULES
 	depends on EXPERIMENTAL
 	bool "module support"
-	option modules
+	modules
 	help
 	  This option enables support for loadable modules via insmod. Module
 	  support is quite experimental at the moment. There is no convenient
scripts/basic/.gitignore +1 -1
index 98ae1f509..961c91c8a 100644
@@ -1,2 +1,2 @@
 # SPDX-License-Identifier: GPL-2.0-only
-fixdep
+/fixdep
scripts/basic/fixdep.c +7 -38

79 lines not on this page · raw message

scripts/kconfig/.gitignore +3 -10
index c3d537cd0..500e7424b 100644
@@ -1,12 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0-only
+/conf
+/[gmnq]conf
+/[gmnq]conf-cfg
 /qconf-moc.cc
-*conf-cfg
-
-#
-# configuration programs
-#
-conf
-mconf
-nconf
-qconf
-gconf
scripts/kconfig/Makefile +35 -38

124 lines not on this page · raw message

scripts/kconfig/conf.c +321 -119

518 lines not on this page · raw message

scripts/kconfig/confdata.c +48 -230

380 lines not on this page · raw message

scripts/kconfig/expr.h +0 -6
index 5c3443692..9c9caca5b 100644
@@ -156,9 +156,6 @@ struct symbol {
 /* choice values need to be set before calculating this symbol value */
 #define SYMBOL_NEED_SET_CHOICE_VALUES  0x100000
 
-/* Set symbol to y if allnoconfig; used for symbols that hide others */
-#define SYMBOL_ALLNOCONFIG_Y 0x200000
-
 #define SYMBOL_MAXLENGTH	256
 #define SYMBOL_HASHSIZE		9973
 
@@ -281,15 +278,12 @@ struct jump_key {
 	int index;
 };
 
-#define JUMP_NB			9
-
 extern struct file *file_list;
 extern struct file *current_file;
 struct file *lookup_file(const char *name);
 
 extern struct symbol symbol_yes, symbol_no, symbol_mod;
 extern struct symbol *modules_sym;
-extern struct symbol *sym_defconfig_list;
 extern int cdebug;
 struct expr *expr_alloc_symbol(struct symbol *sym);
 struct expr *expr_alloc_one(enum expr_type type, struct expr *ce);
scripts/kconfig/gconf.c +6 -9
index 5527482c3..17adabfd6 100644
@@ -3,10 +3,6 @@
  * Copyright (C) 2002-2003 Romain Lievin <[email protected]>
  */
 
-#ifdef HAVE_CONFIG_H
-#  include <config.h>
-#endif
-
 #include <stdlib.h>
 #include "lkc.h"
 #include "images.h"
@@ -1048,8 +1044,13 @@ static gchar **fill_row(struct menu *menu)
 		g_free(row[i]);
 	bzero(row, sizeof(row));
 
+	ptype = menu->prompt ? menu->prompt->type : P_UNKNOWN;
+
 	row[COL_OPTION] =
-	    g_strdup_printf("%s %s", menu_get_prompt(menu),
+	    g_strdup_printf("%s %s %s %s",
+			    ptype == P_COMMENT ? "***" : "",
+			    menu_get_prompt(menu),
+			    ptype == P_COMMENT ? "***" : "",
 			    sym && !sym_has_value(sym) ? "(NEW)" : "");
 
 	if (opt_mode == OPT_ALL && !menu_is_visible(menu))
@@ -1060,7 +1061,6 @@ static gchar **fill_row(struct menu *menu)
 	else
 		row[COL_COLOR] = g_strdup("Black");
 
-	ptype = menu->prompt ? menu->prompt->type : P_UNKNOWN;
 	switch (ptype) {
 	case P_MENU:
 		row[COL_PIXBUF] = (gchar *) xpm_menu;
@@ -1452,9 +1452,6 @@ int main(int ac, char *av[])
 	gtk_init(&ac, &av);
 	glade_init();
 
-	//add_pixmap_directory (PACKAGE_DATA_DIR "/" PACKAGE "/pixmaps");
-	//add_pixmap_directory (PACKAGE_SOURCE_DIR "/pixmaps");
-
 	/* Determine GUI path */
 	env = getenv(SRCTREE);
 	if (env)
scripts/kconfig/internal.h new file +9 -0
new file mode 100644
index 000000000..2f7298c21
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef INTERNAL_H
+#define INTERNAL_H
+
+struct menu;
+
+extern struct menu *current_menu, *current_entry;
+
+#endif /* INTERNAL_H */
scripts/kconfig/lexer.l +0 -4
index 240109f96..312cbad2d 100644
@@ -12,7 +12,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 
 #include "lkc.h"
 #include "parser.tab.h"
@@ -92,7 +91,6 @@ n	[A-Za-z0-9_-]
 [ \t]*			/* whitespaces */
 \\\n			/* escaped new line */
 \n			return T_EOL;
-"allnoconfig_y"		return T_ALLNOCONFIG_Y;
 "bool"			return T_BOOL;
 "choice"		return T_CHOICE;
 "comment"		return T_COMMENT;
@@ -100,7 +98,6 @@ n	[A-Za-z0-9_-]
 "def_bool"		return T_DEF_BOOL;
 "def_tristate"		return T_DEF_TRISTATE;
 "default"		return T_DEFAULT;
-"defconfig_list"	return T_DEFCONFIG_LIST;
 "depends"		return T_DEPENDS;
 "endchoice"		return T_ENDCHOICE;
 "endif"			return T_ENDIF;
@@ -115,7 +112,6 @@ n	[A-Za-z0-9_-]
 "menuconfig"		return T_MENUCONFIG;
 "modules"		return T_MODULES;
 "on"			return T_ON;
-"option"		return T_OPTION;
 "optional"		return T_OPTIONAL;
 "prompt"		return T_PROMPT;
 "range"			return T_RANGE;
scripts/kconfig/lkc.h +31 -35

102 lines not on this page · raw message

scripts/kconfig/lkc_proto.h +1 -14
index f9ab98238..a11626bdc 100644
@@ -8,24 +8,11 @@ int conf_read_simple(const char *name, int);
 int conf_write_defconfig(const char *name);
 int conf_write(const char *name);
 int conf_write_autoconf(int overwrite);
+void conf_set_changed(bool val);
 bool conf_get_changed(void);
 void conf_set_changed_callback(void (*fn)(void));
 void conf_set_message_callback(void (*fn)(const char *s));
 
-/* menu.c */
-extern struct menu rootmenu;
-
-bool menu_is_empty(struct menu *menu);
-bool menu_is_visible(struct menu *menu);
-bool menu_has_prompt(struct menu *menu);
-const char * menu_get_prompt(struct menu *menu);
-struct menu * menu_get_root_menu(struct menu *menu);
-struct menu * menu_get_parent_menu(struct menu *menu);
-bool menu_has_help(struct menu *menu);
-const char * menu_get_help(struct menu *menu);
-struct gstr get_relations_str(struct symbol **sym_arr, struct list_head *head);
-void menu_get_ext_help(struct menu *menu, struct gstr *help);
-
 /* symbol.c */
 extern struct symbol * symbol_hash[SYMBOL_HASHSIZE];
 
scripts/kconfig/lxdialog/util.c +2 -2
index 1b490d4af..3f78fb265 100644
@@ -363,7 +363,7 @@ void print_title(WINDOW *dialog, const char *title, int width)
 /*
  * Print a string of text in a window, automatically wrap around to the
  * next line if the string is too long to fit on one line. Newline
- * characters '\n' are propperly processed.  We start on a new line
+ * characters '\n' are properly processed.  We start on a new line
  * if there is no room for at least 4 nonblanks following a double-space.
  */
 void print_autowrap(WINDOW * win, const char *prompt, int width, int y, int x)
@@ -541,7 +541,7 @@ int first_alpha(const char *string, const char *exempt)
  * lxdialog suggest <ESC> <ESC> which is correctly translated to two
  * times esc. But then we need to ignore the second esc to avoid stepping
  * out one menu too much. Filter away all escaped key sequences since
- * keypad(FALSE) turn off ncurses support for escape sequences - and thats
+ * keypad(FALSE) turn off ncurses support for escape sequences - and that's
  * needed to make notimeout() do as expected.
  */
 int on_key_esc(WINDOW *win)
scripts/kconfig/mconf-cfg.sh +3 -1
index aa68ec956..b520e407a 100755
@@ -33,7 +33,9 @@ if [ -f /usr/include/ncurses/ncurses.h ]; then
 	exit 0
 fi
 
-if [ -f /usr/include/ncurses.h ]; then
+# As a final fallback before giving up, check if $HOSTCC knows of a default
+# ncurses installation (e.g. from a vendor-specific sysroot).
+if echo '#include <ncurses.h>' | ${HOSTCC} -E - >/dev/null 2>&1; then
 	echo cflags=\"-D_GNU_SOURCE\"
 	echo libs=\"-lncurses\"
 	exit 0
scripts/kconfig/mconf.c +6 -9
index 4063dbc1b..9d3cf5105 100644
@@ -22,6 +22,8 @@
 #include "lkc.h"
 #include "lxdialog/dialog.h"
 
+#define JUMP_NB			9
+
 static const char mconf_readme[] =
 "Overview\n"
 "--------\n"
@@ -297,17 +299,12 @@ static char filename[PATH_MAX+1];
 static void set_config_filename(const char *config_filename)
 {
 	static char menu_backtitle[PATH_MAX+128];
-	int size;
 
-	size = snprintf(menu_backtitle, sizeof(menu_backtitle),
-			"%s - %s", config_filename, rootmenu.prompt->text);
-	if (size >= sizeof(menu_backtitle))
-		menu_backtitle[sizeof(menu_backtitle)-1] = '\0';
+	snprintf(menu_backtitle, sizeof(menu_backtitle), "%s - %s",
+		 config_filename, rootmenu.prompt->text);
 	set_dialog_backtitle(menu_backtitle);
 
-	size = snprintf(filename, sizeof(filename), "%s", config_filename);
-	if (size >= sizeof(filename))
-		filename[sizeof(filename)-1] = '\0';
+	snprintf(filename, sizeof(filename), "%s", config_filename);
 }
 
 struct subtitle_part {
@@ -908,7 +905,7 @@ static void conf_load(void)
 				return;
 			if (!conf_read(dialog_input_result)) {
 				set_config_filename(dialog_input_result);
-				sym_set_change_count(1);
+				conf_set_changed(true);
 				return;
 			}
 			show_textbox(NULL, "File does not exist!", 5, 38);
scripts/kconfig/menu.c +1 -22
index a5fbd6ccc..606ba8a63 100644
@@ -9,6 +9,7 @@
 #include <string.h>
 
 #include "lkc.h"
+#include "internal.h"
 
 static const char nohelp_text[] = "There is no help available for this option.";
 
@@ -211,28 +212,6 @@ void menu_add_symbol(enum prop_type type, struct symbol *sym, struct expr *dep)
 	menu_add_prop(type, expr_alloc_symbol(sym), dep);
 }
 
-void menu_add_option_modules(void)
-{
-	if (modules_sym)
-		zconf_error("symbol '%s' redefines option 'modules' already defined by symbol '%s'",
-			    current_entry->sym->name, modules_sym->name);
-	modules_sym = current_entry->sym;
-}
-
-void menu_add_option_defconfig_list(void)
-{
-	if (!sym_defconfig_list)
-		sym_defconfig_list = current_entry->sym;
-	else if (sym_defconfig_list != current_entry->sym)
-		zconf_error("trying to redefine defconfig symbol");
-	sym_defconfig_list->flags |= SYMBOL_NO_WRITE;
-}
-
-void menu_add_option_allnoconfig_y(void)
-{
-	current_entry->sym->flags |= SYMBOL_ALLNOCONFIG_Y;
-}
-
 static int menu_validate_number(struct symbol *sym, struct symbol *sym2)
 {
 	return sym2->type == S_INT || sym2->type == S_HEX ||
scripts/kconfig/nconf.c +26 -33

141 lines not on this page · raw message

scripts/kconfig/nconf.gui.c +117 -167

342 lines not on this page · raw message

scripts/kconfig/nconf.h +21 -30

63 lines not on this page · raw message

scripts/kconfig/parser.y +8 -19
index 190f1117f..2af7ce4e1 100644
@@ -12,6 +12,7 @@
 #include <stdbool.h>
 
 #include "lkc.h"
+#include "internal.h"
 
 #define printd(mask, fmt...) if (cdebug & (mask)) printf(fmt)
 
@@ -28,7 +29,7 @@ static bool zconf_endtoken(const char *tokenname,
 
 struct symbol *symbol_hash[SYMBOL_HASHSIZE];
 
-static struct menu *current_menu, *current_entry;
+struct menu *current_menu, *current_entry;
 
 %}
 
@@ -45,7 +46,6 @@ static struct menu *current_menu, *current_entry;
 %token <string> T_HELPTEXT
 %token <string> T_WORD
 %token <string> T_WORD_QUOTE
-%token T_ALLNOCONFIG_Y
 %token T_BOOL
 %token T_CHOICE
 %token T_CLOSE_PAREN
@@ -53,7 +53,6 @@ static struct menu *current_menu, *current_entry;
 %token T_COMMENT
 %token T_CONFIG
 %token T_DEFAULT
-%token T_DEFCONFIG_LIST
 %token T_DEF_BOOL
 %token T_DEF_TRISTATE
 %token T_DEPENDS
@@ -71,7 +70,6 @@ static struct menu *current_menu, *current_entry;
 %token T_MODULES
 %token T_ON
 %token T_OPEN_PAREN
-%token T_OPTION
 %token T_OPTIONAL
 %token T_PLUS_EQUAL
 %token T_PROMPT
@@ -218,19 +216,12 @@ config_option: T_RANGE symbol symbol if_expr T_EOL
 	printd(DEBUG_PARSE, "%s:%d:range\n", zconf_curname(), zconf_lineno());
 };
 
-config_option: T_OPTION T_MODULES T_EOL
+config_option: T_MODULES T_EOL
 {
-	menu_add_option_modules();
-};
-
-config_option: T_OPTION T_DEFCONFIG_LIST T_EOL
-{
-	menu_add_option_defconfig_list();
-};
-
-config_option: T_OPTION T_ALLNOCONFIG_Y T_EOL
-{
-	menu_add_option_allnoconfig_y();
+	if (modules_sym)
+		zconf_error("symbol '%s' redefines option 'modules' already defined by symbol '%s'",
+			    current_entry->sym->name, modules_sym->name);
+	modules_sym = current_entry->sym;
 };
 
 /* choice entry */
@@ -517,7 +508,7 @@ void conf_parse(const char *name)
 	}
 	if (yynerrs)
 		exit(1);
-	sym_set_change_count(1);
+	conf_set_changed(true);
 }
 
 static bool zconf_endtoken(const char *tokenname,
@@ -723,5 +714,3 @@ void zconfdump(FILE *out)
 		}
 	}
 }
-
-#include "menu.c"
scripts/kconfig/preprocess.c +1 -1
index 0243086fb..0590f86df 100644
@@ -114,7 +114,7 @@ static char *do_error_if(int argc, char *argv[])
 	if (!strcmp(argv[0], "y"))
 		pperror("%s", argv[1]);
 
-	return NULL;
+	return xstrdup("");
 }
 
 static char *do_filename(int argc, char *argv[])
scripts/kconfig/qconf-cfg.sh +3 -11
index 02ccc0ae1..fa564cd79 100755
@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: GPL-2.0
 
 PKG="Qt5Core Qt5Gui Qt5Widgets"
-PKG2="QtCore QtGui"
 
 if [ -z "$(command -v pkg-config)" ]; then
 	echo >&2 "*"
@@ -12,21 +11,14 @@ if [ -z "$(command -v pkg-config)" ]; then
 fi
 
 if pkg-config --exists $PKG; then
-	echo cflags=\"-std=c++11 -fPIC $(pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets)\"
+	echo cflags=\"-std=c++11 -fPIC $(pkg-config --cflags $PKG)\"
 	echo libs=\"$(pkg-config --libs $PKG)\"
 	echo moc=\"$(pkg-config --variable=host_bins Qt5Core)/moc\"
 	exit 0
 fi
 
-if pkg-config --exists $PKG2; then
-	echo cflags=\"$(pkg-config --cflags $PKG2)\"
-	echo libs=\"$(pkg-config --libs $PKG2)\"
-	echo moc=\"$(pkg-config --variable=moc_location QtCore)\"
-	exit 0
-fi
-
 echo >&2 "*"
-echo >&2 "* Could not find Qt via pkg-config."
-echo >&2 "* Please install either Qt 4.8 or 5.x. and make sure it's in PKG_CONFIG_PATH"
+echo >&2 "* Could not find Qt5 via pkg-config."
+echo >&2 "* Please install Qt5 and make sure it's in PKG_CONFIG_PATH"
 echo >&2 "*"
 exit 1
scripts/kconfig/qconf.cc +236 -281

851 lines not on this page · raw message

scripts/kconfig/qconf.h +23 -54

77 lines not on this page · raw message

scripts/kconfig/streamline_config.pl +6 -3
index 19857d18d..911c72a2d 100755

Lines of this file are not shown. View the raw message.

scripts/kconfig/symbol.c +2 -3
index ffa3ec65c..5844d636d 100644

Lines of this file are not shown. View the raw message.

scripts/kconfig/tests/choice/Kconfig +1 -1
index a412205b1..0930eb65e 100644

Lines of this file are not shown. View the raw message.

scripts/kconfig/tests/choice_value_with_m_dep/Kconfig +1 -1
index 7106c26bb..bd970cec0 100644

Lines of this file are not shown. View the raw message.

scripts/kconfig/tests/conftest.py +4 -0
index 0345ef6e3..af8774a56 100644

Lines of this file are not shown. View the raw message.

scripts/kconfig/tests/inter_choice/Kconfig +1 -1
index 5698a4018..26c25f686 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 7 lines
2.27.0


_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox

Part of the diff is not shown here. View the raw message.

Applied
#1 lore raw
Quoted 16 lines · Masahiro Yamada

The previous sync was Linux 5.9-rc2.

Resync scripts/kconfig/ with Linux 5.13-rc1.

Highlights:

- make header names in include/config/ and CONFIG symbols match (scripts/basic/fixdep.c was adjusted)

- remove all 'option' syntax
(common/Kconfig was adjusted)

- introduce KCONFIG_DEFCONFIG_LIST instead of 'option defconfig_list'

- bug fixes and cleanups of nconfig

Quoted 8 lines

- drop Qt4 support from xconfig

- bug fixes, improvements, cleanups of xconfig

- print a short log for syncconfig

---

Applied, thanks

Sascha

Signature · 9 lines
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#2 lore raw
In reply to Masahiro Yamada

Hi Masahiro,

Quoted 16 lines · Masahiro Yamada

The previous sync was Linux 5.9-rc2.

Resync scripts/kconfig/ with Linux 5.13-rc1.

Highlights:

- make header names in include/config/ and CONFIG symbols match (scripts/basic/fixdep.c was adjusted)

- remove all 'option' syntax
(common/Kconfig was adjusted)

- introduce KCONFIG_DEFCONFIG_LIST instead of 'option defconfig_list'

- bug fixes and cleanups of nconfig

Quoted 8 lines

- drop Qt4 support from xconfig

- bug fixes, improvements, cleanups of xconfig

- print a short log for syncconfig

---

This breaks building firmware:

make[1]: *** No rule to make target 'include/config/extra/firmware/dir.h', needed by 'firmware/lpddr4_pmu_train_1d_dmem.bin.gen.S'. Stop.

This happens on imx_v8_defconfig.

Do we need an adoption of 3470d9eb6387 any maybe more?

Sascha

Signature · 9 lines
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox
#3 lore raw
Quoted 29 lines · Sascha Hauer

Hi Masahiro,

Quoted 16 lines · Masahiro Yamada

The previous sync was Linux 5.9-rc2.

Resync scripts/kconfig/ with Linux 5.13-rc1.

Highlights:

- make header names in include/config/ and CONFIG symbols match (scripts/basic/fixdep.c was adjusted)

- remove all 'option' syntax
(common/Kconfig was adjusted)

- introduce KCONFIG_DEFCONFIG_LIST instead of 'option defconfig_list'

- bug fixes and cleanups of nconfig

Quoted 8 lines

- drop Qt4 support from xconfig

- bug fixes, improvements, cleanups of xconfig

- print a short log for syncconfig

---

Quoted 7 lines

This breaks building firmware:

make[1]: *** No rule to make target 'include/config/extra/firmware/dir.h', needed by 'firmware/lpddr4_pmu_train_1d_dmem.bin.gen.S'. Stop.

This happens on imx_v8_defconfig.

Do we need an adoption of 3470d9eb6387 any maybe more?

Yes, I think so.

Thanks.

Signature · 7 lines
Best Regards
Masahiro Yamada

_______________________________________________
barebox mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/barebox