Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a1ef0e0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

Pull kconfig updates from Michal Marek:
 "Just two kconfig commits this time:

   - kconfig Makefile fix for make 3.80

   - Fix calculating symbols so that KCONFIG_ALLCONFIG=... does not
     disable CONFIG_MODULES silently"

* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  unbreak allmodconfig KCONFIG_ALLCONFIG=...
  scripts/kconfig: allow building with make 3.80 again
parents 2162b80f 6b87b70c

scripts/kconfig/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -96,13 +96,15 @@ savedefconfig: $(obj)/conf 
defconfig: $(obj)/conf

ifeq ($(KBUILD_DEFCONFIG),)

	$< $(silent) --defconfig $(Kconfig)

else ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)

else

ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG)),)

	@$(kecho) "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"

	$(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)

else

	@$(kecho) "*** Default configuration is based on target '$(KBUILD_DEFCONFIG)'"

	$(Q)$(MAKE) -f $(srctree)/Makefile $(KBUILD_DEFCONFIG)

endif

endif



%_defconfig: $(obj)/conf

	$(Q)$< $(silent) --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)

scripts/kconfig/confdata.c

+7 −5
Original line number Diff line number Diff line
@@ -267,10 +267,8 @@ int conf_read_simple(const char *name, int def) 
		if (in)

			goto load;

		sym_add_change_count(1);

		if (!sym_defconfig_list) {

			sym_calc_value(modules_sym);

		if (!sym_defconfig_list)

			return 1;

		}



		for_all_defaults(sym_defconfig_list, prop) {

			if (expr_calc_value(prop->visible.expr) == no ||
@@ -403,7 +401,6 @@ int conf_read_simple(const char *name, int def) 
	}

	free(line);

	fclose(in);

	sym_calc_value(modules_sym);

	return 0;

}
@@ -414,8 +411,12 @@ int conf_read(const char *name) 


	sym_set_change_count(0);



	if (conf_read_simple(name, S_DEF_USER))

	if (conf_read_simple(name, S_DEF_USER)) {

		sym_calc_value(modules_sym);

		return 1;

	}



	sym_calc_value(modules_sym);



	for_all_symbols(i, sym) {

		sym_calc_value(sym);
@@ -846,6 +847,7 @@ static int conf_split_config(void) 


	name = conf_get_autoconfig_name();

	conf_read_simple(name, S_DEF_AUTO);

	sym_calc_value(modules_sym);



	if (chdir("include/config"))

		return 1;