forked from vicharak-in/vicharak-linux-u-boot
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
kconfig: switch to single .config configuration
When Kconfig for U-boot was examined, one of the biggest issues was how to support multiple images (Normal, SPL, TPL). There were actually two options, "single .config" and "multiple .config". After some discussions and thought experiments, I chose the latter, i.e. to create ".config", "spl/.config", "tpl/.config" for Normal, SPL, TPL, respectively. It is true that the "multiple .config" strategy provided us the maximum flexibility and helped to avoid duplicating CONFIGs among Normal, SPL, TPL, but I have noticed some fatal problems: [1] It is impossible to share CONFIG options across the images. If you change the configuration of Main image, you often have to adjust some SPL configurations correspondingly. Currently, we cannot handle the dependencies between them. It means one of the biggest advantages of Kconfig is lost. [2] It is too painful to change both ".config" and "spl/.config". Sunxi guys started to work around this problem by creating a new configuration target. Commit cbdd9a9 (sunxi: kconfig: Add %_felconfig rule to enable FEL build of sunxi platforms.) added "make *_felconfig" to enable CONFIG_SPL_FEL on both images. Changing the configuration of multiple images in one command is a generic demand. The current implementation cannot propose any good solution about this. [3] Kconfig files are getting ugly and difficult to understand. Commit b724bd7 (dm: Kconfig: Move CONFIG_SYS_MALLOC_F_LEN to Kconfig) has sprinkled "if !SPL_BUILD" over the Kconfig files. [4] The build system got more complicated than it should be. To adjust Linux-originated Kconfig to U-Boot, the helper script "scripts/multiconfig.sh" was introduced. Writing a complicated text processor is a shell script sometimes caused problems. Now I believe the "single .config" will serve us better. With it, all the problems above would go away. Instead, we will have to add some CONFIG_SPL_* (and CONFIG_TPL_*) options such as CONFIG_SPL_DM, but we will not have much. Anyway, this is what we do now in scripts/Makefile.spl. I admit my mistake with my apology and this commit switches to the single .config configuration. It is not so difficult to do that: - Remove unnecessary processings from scripts/multiconfig.sh This file will remain for a while to support the current defconfig format. It will be removed after more cleanups are done. - Adjust some makefiles and Kconfigs - Add some entries to include/config_uncmd_spl.h and the new file scripts/Makefile.uncmd_spl. Some CONFIG options that are not supported on SPL must be disabled because one .config is shared between SPL and U-Boot proper going forward. I know this is not a beautiful solution and I think we can do better, but let's see how much we will have to describe them. - update doc/README.kconfig More cleaning up patches will follow this. Signed-off-by: Masahiro Yamada <[email protected]> Reviewed-by: Simon Glass <[email protected]>
- Loading branch information
Showing
15 changed files
with
108 additions
and
389 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,9 +7,17 @@ | |
| # (= When we move all CONFIGs from header files to Kconfig) | ||
| # this makefile can be deleted. | ||
|
|
||
| # obj is "include" or "spl/include" or "tpl/include" | ||
| # for non-SPL, SPL, TPL, respectively | ||
| include $(obj)/config/auto.conf | ||
| __all: include/autoconf.mk include/autoconf.mk.dep | ||
|
|
||
| ifeq ($(shell grep -q '^CONFIG_SPL=y' include/config/auto.conf 2>/dev/null && echo y),y) | ||
| __all: spl/include/autoconf.mk | ||
| endif | ||
|
|
||
| ifeq ($(shell grep -q '^CONFIG_TPL=y' include/config/auto.conf 2>/dev/null && echo y),y) | ||
| __all: tpl/include/autoconf.mk | ||
| endif | ||
|
|
||
| include include/config/auto.conf | ||
|
|
||
| include scripts/Kbuild.include | ||
|
|
||
|
|
@@ -22,7 +30,6 @@ CPP = $(CC) -E | |
| include config.mk | ||
|
|
||
| UBOOTINCLUDE := \ | ||
| -I$(obj) \ | ||
| -Iinclude \ | ||
| $(if $(KBUILD_SRC), -I$(srctree)/include) \ | ||
| -I$(srctree)/arch/$(ARCH)/include \ | ||
|
|
@@ -48,10 +55,10 @@ include/autoconf.mk.dep: FORCE | |
| # same CONFIG macros | ||
| quiet_cmd_autoconf = GEN $@ | ||
| cmd_autoconf = \ | ||
| $(CPP) $(c_flags) -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > [email protected] && { \ | ||
| $(CPP) $(c_flags) $2 -DDO_DEPS_ONLY -dM $(srctree)/include/common.h > [email protected] && { \ | ||
| sed -n -f $(srctree)/tools/scripts/define2mk.sed [email protected] | \ | ||
| while read line; do \ | ||
| if ! grep -q "$${line%=*}=" $(obj)/config/auto.conf; then \ | ||
| if ! grep -q "$${line%=*}=" include/config/auto.conf; then \ | ||
| echo "$$line"; \ | ||
| fi \ | ||
| done > $@; \ | ||
|
|
@@ -60,10 +67,19 @@ quiet_cmd_autoconf = GEN $@ | |
| rm [email protected]; false; \ | ||
| } | ||
|
|
||
| $(obj)/autoconf.mk: FORCE | ||
| include/autoconf.mk: FORCE | ||
| $(call cmd,autoconf) | ||
|
|
||
| include/autoconf.mk include/autoconf.mk.dep: include/config.h | ||
| spl/include/autoconf.mk: FORCE | ||
| $(Q)mkdir -p $(dir $@) | ||
| $(call cmd,autoconf,-DCONFIG_SPL_BUILD) | ||
|
|
||
| tpl/include/autoconf.mk: FORCE | ||
| $(Q)mkdir -p $(dir $@) | ||
| $(call cmd,autoconf,-DCONFIG_SPL_BUILD -DCONFIG_TPL_BUILD) | ||
|
|
||
| include/autoconf.mk include/autoconf.mk.dep \ | ||
| spl/include/autoconf.mk tpl/include/autoconf.mk: include/config.h | ||
|
|
||
| # include/config.h | ||
| # Prior to Kconfig, it was generated by mkconfig. Now it is created here. | ||
|
|
@@ -75,10 +91,10 @@ define filechk_config_h | |
| done; \ | ||
| echo \#define CONFIG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\ | ||
| echo \#include \<config_defaults.h\>; \ | ||
| echo \#include \<config_uncmd_spl.h\>; \ | ||
| echo \#include \<configs/$(CONFIG_SYS_CONFIG_NAME).h\>; \ | ||
| echo \#include \<asm/config.h\>; \ | ||
| echo \#include \<config_fallbacks.h\>; \ | ||
| echo \#include \<config_uncmd_spl.h\>; ) | ||
| echo \#include \<config_fallbacks.h\>;) | ||
| endef | ||
|
|
||
| include/config.h: scripts/Makefile.autoconf create_symlink FORCE | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| # Makefile version of include/config_uncmd_spl.h | ||
| # | ||
| # TODO: Invent a better way | ||
|
|
||
| ifdef CONFIG_SPL_BUILD | ||
| CONFIG_OF_CONTROL= | ||
|
|
||
| ifndef CONFIG_SPL_DM | ||
| CONFIG_DM_SERIAL= | ||
| CONFIG_DM_GPIO= | ||
| CONIFG_DM_I2C= | ||
| CONFIG_DM_SPI= | ||
| CONFIG_DM_SPI_FLASH= | ||
| endif | ||
|
|
||
| endif |
Oops, something went wrong.