Changes in Makefile.uncmd_spl

b3e08737315d8639f7aed97bac18c9809cabd3de - UPSTREAM: scripts: spl: fix typo

Thu, 30 Nov 2017 02:07:07 +0000

UPSTREAM: scripts: spl: fix typoTypo fix: CONIFG->CONFIGChange-Id: Ib4a1e77aacf0bc3cae32158623c3805cd279fd9fSigned-off-by: Peng Fan Cc: Tom Rini Cc: Simon Glass Reviewed-by: Simon Glass Signed-off-by: Kever Yang (cherry picked from commit 448df354b0725093f857e15a4ab5e849c4ecf3e0) List of files: /rk3399_rockchip-uboot/scripts/Makefile.uncmd_spl

f32c86493822174e27f4b3c7c9359094406afbd8 - scripts/Makefile* Add SPDX-License-Identifier tag

Thu, 14 Jan 2016 23:24:44 +0000

scripts/Makefile* Add SPDX-License-Identifier tagA general best practice for SPDX is that Makefiles should have anidentifier, add these as everything else is currently covered.Signed-off-by: Tom Rini List of files: /rk3399_rockchip-uboot/scripts/Makefile.uncmd_spl

0f9258228e2b2070368ffccf5c243218128770a8 - of: clean up OF_CONTROL ifdef conditionals

Tue, 11 Aug 2015 22:31:55 +0000

of: clean up OF_CONTROL ifdef conditionalsWe have flipped CONFIG_SPL_DISABLE_OF_CONTROL. We have cleansingdevices, $(SPL_) and CONFIG_IS_ENABLED(), so we are ready to clearaway the ugly logic in include/fdtdec.h: #ifdef CONFIG_OF_CONTROL # if defined(CONFIG_SPL_BUILD) && !defined(SPL_OF_CONTROL) # define OF_CONTROL 0 # else # define OF_CONTROL 1 # endif #else # define OF_CONTROL 0 #endifNow CONFIG_IS_ENABLED(OF_CONTROL) is the substitute. It refers toCONFIG_OF_CONTROL for U-boot proper and CONFIG_SPL_OF_CONTROL forSPL.Also, we no longer have to cancel CONFIG_OF_CONTROL ininclude/config_uncmd_spl.h and scripts/Makefile.spl.Signed-off-by: Masahiro Yamada Reviewed-by: Tom Rini Reviewed-by: Simon Glass Acked-by: Linus Walleij List of files: /rk3399_rockchip-uboot/scripts/Makefile.uncmd_spl

dffb86e468c8e02ba77283989aefef214d904dc5 - of: flip CONFIG_SPL_DISABLE_OF_CONTROL into CONFIG_SPL_OF_CONTROL

Tue, 11 Aug 2015 22:31:54 +0000

of: flip CONFIG_SPL_DISABLE_OF_CONTROL into CONFIG_SPL_OF_CONTROLAs we discussed a couple of times, negative CONFIG options make ourlife difficult; CONFIG_SYS_NO_FLASH, CONFIG_SYS_DCACHE_OFF, ...and here is another one.Now, there are three boards enabling OF_CONTROL on SPL: - socfpga_arria5_defconfig - socfpga_cyclone5_defconfig - socfpga_socrates_defconfigThis commit adds CONFIG_SPL_OF_CONTROL for them and deletesCONFIG_SPL_DISABLE_OF_CONTROL from the other boards to invertthe logic.Signed-off-by: Masahiro Yamada Reviewed-by: Tom Rini Reviewed-by: Simon Glass List of files: /rk3399_rockchip-uboot/scripts/Makefile.uncmd_spl

0a5804b53a3c71dc0c9c43e5c747015b6e50e9e1 - dm: drop CONFIG_DM_DEVICE_REMOVE from uncmd list

Tue, 11 Aug 2015 22:31:52 +0000

dm: drop CONFIG_DM_DEVICE_REMOVE from uncmd listWe do not want to compile the DM remove code for SPL. Currently,we undef it in include/config_uncmd_spl.h (for C files) and inscripts/Makefile.uncmd_spl (for Makefiles). This is really ugly.This commit demonstrates how we can deprecate those two files.Use $(SPL_) for the entry in the Makfile and CONFIG_IS_ENABLED()in C files.Signed-off-by: Masahiro Yamada Reviewed-by: Tom Rini Reviewed-by: Simon Glass List of files: /rk3399_rockchip-uboot/scripts/Makefile.uncmd_spl

6f43ba70d15e15a08c25b3d956c70addb6740737 - Merge branch 'u-boot/master' into 'u-boot-arm/master'

Tue, 07 Jul 2015 09:38:44 +0000

Merge branch 'u-boot/master' into 'u-boot-arm/master' List of files: /rk3399_rockchip-uboot/scripts/Makefile.uncmd_spl

212b66016120fa4cd3b8f7edbe4c9f106032884e - Merge branch 'master' of git://git.denx.de/u-boot

Mon, 15 Jun 2015 10:08:11 +0000

Merge branch 'master' of git://git.denx.de/u-boot List of files: /rk3399_rockchip-uboot/scripts/Makefile.uncmd_spl

b9130d88fa9e251123e2282184e8c1f3ae428a8a - Merge git://git.denx.de/u-boot-dm

Fri, 12 Jun 2015 01:18:52 +0000

Merge git://git.denx.de/u-boot-dm List of files: /rk3399_rockchip-uboot/scripts/Makefile.uncmd_spl

a59abd10498fed8c2bb5718748ba27310aac4ba2 - Remove SPL undefine of CONFIG_OF_CONTROL

Tue, 12 May 2015 20:55:07 +0000

Remove SPL undefine of CONFIG_OF_CONTROLAllow SPL to be built with this option so that we can support device treecontrol. Disable the simple bus for now in SPL. It may be needed later.Signed-off-by: Simon Glass List of files: /rk3399_rockchip-uboot/scripts/Makefile.uncmd_spl

b9cb64825b5e6efeb715abd8b48d9b12f98973e9 - Merge branch 'master' of git://git.denx.de/u-boot

Mon, 02 Mar 2015 08:42:53 +0000

Merge branch 'master' of git://git.denx.de/u-boot List of files: /rk3399_rockchip-uboot/scripts/Makefile.uncmd_spl

d648964fc2495f1184af5782a0b7fc670ba5826e - kconfig: remove unneeded dependency on !SPL_BUILD

Tue, 24 Feb 2015 13:26:21 +0000

kconfig: remove unneeded dependency on !SPL_BUILDNow CONFIG_SPL_BUILD is not defined in Kconfig, so"!depends on SPL_BUILD" and "if !SPL_BUILD" are redundant.Signed-off-by: Masahiro Yamada List of files: /rk3399_rockchip-uboot/scripts/Makefile.uncmd_spl

e02ee2548afe22f7d197b89df2ae7bd72f1df630 - kconfig: switch to single .config configuration

Tue, 24 Feb 2015 13:26:20 +0000

kconfig: switch to single .config configurationWhen Kconfig for U-boot was examined, one of the biggest issues washow to support multiple images (Normal, SPL, TPL). There wereactually 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 themaximum flexibility and helped to avoid duplicating CONFIGs amongNormal, 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 cbdd9a9737cc (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 b724bd7d6349 (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 addsome CONFIG_SPL_* (and CONFIG_TPL_*) options such as CONFIG_SPL_DM,but we will not have much. Anyway, this is what we do now inscripts/Makefile.spl.I admit my mistake with my apology and this commit switches to thesingle .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.kconfigMore cleaning up patches will follow this.Signed-off-by: Masahiro Yamada Reviewed-by: Simon Glass List of files: /rk3399_rockchip-uboot/scripts/Makefile.uncmd_spl