Changes in Makefile

bf7ab1e70fd7621fea5dea07b6975c576119b86e - kconfig: re-sync with Linux 4.10

Sat, 11 Feb 2017 03:39:54 +0000

kconfig: re-sync with Linux 4.10Re-sync all files under the scripts/kconfig directory withLinux 4.10.Some parts include U-Boot own modification. I made sure to notrevert the following commits: 5b8031ccb4ed ("Add more SPDX-License-Identifier tags") 192bc6948b02 ("Fix GCC format-security errors and convert sprintfs.") da58dec86616 ("Various Makefiles: Add SPDX-License-Identifier tags") 20c20826efab ("Kconfig: Enable usage of escape char '\' in string values")Signed-off-by: Masahiro Yamada List of files: /rk3399_rockchip-uboot/scripts/kconfig/Makefile

5f5620ab2679608f94b3a77e51c77d0a770103bd - Merge git://git.denx.de/u-boot

Thu, 12 Nov 2015 16:13:26 +0000

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

da58dec866161e8ce73957fea463a8caad695000 - Various Makefiles: Add SPDX-License-Identifier tags

Tue, 10 Nov 2015 01:06:16 +0000

Various Makefiles: Add SPDX-License-Identifier tagsAfter consulting with some of the SPDX team, the conclusion is thatMakefiles are worth adding SPDX-License-Identifier tags too, and most ofours have one. This adds tags to ones that lack them and converts a fewthat had full (or in one case, very partial) license blobs into theequivalent tag.Cc: Kate Stewart Signed-off-by: Tom Rini List of files: /rk3399_rockchip-uboot/scripts/kconfig/Makefile

9b5f0b1da9ba7019316ed8c9698fe25e8c7fc33e - kconfig: sync with Linux 4.1

Sat, 04 Jul 2015 16:56:54 +0000

kconfig: sync with Linux 4.1Update the files under scripts/kconfig/ to match Linux 4.1.Some Kconfig sources have diverged from those in the kernel,so commit-base syncing was done not to lose U-Boot specific updates.The commits cherry-picked from Linux are:[1] commit be8af2d54a66911693eddc556e4f7a866670082b Author: Bjørn Forsman kconfig/lxdialog: get ncurses CFLAGS with pkg-config[2] commit 3943f42c11896ce82ad3da132c8a5630313bdd0e Author: Andrey Utkin Replace mentions of "list_struct" to "list_head"[3] commit e4e458b45c5861808674eebfea94cee2258bb2ea Author: Arjun Sreedharan calloc/xcalloc: Fix argument order[4] commit 09950bc256e3628d275f90e016e6f5a039fbdcab Author: Olof Johansson merge_config.sh: Display usage if given too few arguments[5] commit b6a2ab2cd4739a9573ed41677e53171987b8da34 Author: Colin Ian King kconfig: use va_end to match corresponding va_start[6] commit 70529b1a1784503169416df19ce3d68746401340 Author: Michal Marek kconfig: Get rid of the P() macro in headers[7] commit 463157444e377bf9b279101b1f16a94c4648c03a Author: Michal Marek kconfig: Remove dead code[8] commit ad8d40cda3ad22ad9e8863d55a5c88f85c0173f0 Author: Michal Marek kconfig: Remove unnecessary prototypes from headers[9] commit de4619937229378e81f95e99c9866acc8e207d34 Author: Masahiro Yamada kbuild: mergeconfig: fix "jobserver unavailable" warning[10] commit b9fe99c5b994c6ddc57780993966b18899526c0b Author: Masahiro Yamada kbuild: mergeconfig: move an error check to merge_config.sh[11] commit 371cfd4ff0611d8bc5d18bbb9cc6a2bc3d56cd3d Author: Masahiro Yamada kbuild: mergeconfig: remove redundant $(objtree)[12] commit 3a975b8cfcbe026b535f83bde9a3c009bae214f9 Author: Masahiro Yamada merge_config.sh: improve indentation[13] commit bc8f8f5fc47cd02c2c5f3580dac2fe6695af1edd Author: Masahiro Yamada merge_config.sh: rename MAKE to RUNMAKE[14] commit 63a91033d52e64a22e571fe84924c0b7f21c280d Author: Masahiro Yamada kbuild: add generic mergeconfig target, %.config[15] commit 1cba0c305758c3c1786ecaceb03e142c95a4edc9 Author: Michal Marek kconfig: Simplify Makefile[16] commit 0a1f00a1c86421cc07cec87011c7cf4df68ee54b Author: Michal Marek kconfig: Do not print status messages in make -s modeSigned-off-by: Masahiro Yamada Signed-off-by: Bjørn Forsman Signed-off-by: Andrey Utkin Signed-off-by: Jiri Kosina Signed-off-by: Arjun Sreedharan Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Olof Johansson Signed-off-by: Colin Ian King Signed-off-by: Michal Marek List of files: /rk3399_rockchip-uboot/scripts/kconfig/Makefile

b491d9757d14415edcb1468ed896a704d0f0cfe7 - Merge branch 'u-boot/master'

Fri, 10 Apr 2015 12:22:23 +0000

Merge branch 'u-boot/master' List of files: /rk3399_rockchip-uboot/scripts/kconfig/Makefile

5f9eb2207500f16a598866884f8ee5343ae8949f - kbuild: remove scripts/multiconfig.sh

Fri, 13 Mar 2015 09:08:55 +0000

kbuild: remove scripts/multiconfig.shWe have switched to the single .config configuration system,the same one as used in Linux Kernel.The necessary glue code is small enough now, so move it to thetop-level Makefile and scripts/kconfig/Makefile, and then deletescripts/multiconfig.sh.Signed-off-by: Masahiro Yamada Reviewed-by: Simon Glass List of files: /rk3399_rockchip-uboot/scripts/kconfig/Makefile

ad618992f7199fe93c3ecc3dd397ec0bef575933 - kconfig: sync kconfig files with Linux 3.18-rc1

Thu, 30 Oct 2014 02:06:12 +0000

kconfig: sync kconfig files with Linux 3.18-rc1This commit imports Kconfig updates from Linux 3.18-rc1.'kvmconfig' and 'tinyconfig' help message have been commented outsince they are unavailable at least now; in the future perhapswe can implement 'tinyconfig' to disable most of CONFIG_CMD_* tocreate a very small U-Boot image.[1] commit 3aaefce10351 by Josh Triplettx86, platform, kconfig: move kvmconfig functionality to a helper[2] commit 0da1d4a0b951 by Josh Triplettx86: Add "make tinyconfig" to configure the tiniest possible kernel[3] commit c40724d3f381 by Brian Norris kconfig: lxdialog: fix spelling[4] commit 7285996aa000 by Brian Norris kconfig: nconfig: fix multi-byte UTF handlingSigned-off-by: Josh Triplett Signed-off-by: Brian Norris Signed-off-by: Masahiro Yamada List of files: /rk3399_rockchip-uboot/scripts/kconfig/Makefile

cb6e7b0db9eb602c0cd8a704957619909bdfdb1b - kbuild: improve multi-objs dependency and cleanups

Thu, 30 Oct 2014 02:06:10 +0000

kbuild: improve multi-objs dependency and cleanupsSince Linux 3.18-rc1, Kbuild is able to handle multi-objsdependency correctly, which also allows us futher cleanupsof some makefiles.This commit imports those commits:[1] commit c8589d1e9e01 by Masahiro Yamadakbuild: handle multi-objs dependency appropriately[2] commit 97e3226e6e98 by Masahiro Yamadakbuild: handle the dependency of multi-objs hostprogs appropriately[3] commit 022af62d0190 by Masahiro Yamadakbuild: refactor script/kconfig/Makefile[4] commit 221ecca6cafe by Masahiro Yamadakbuild: remove redundant clean-files from scripts/kconfig/MakefileSigned-off-by: Masahiro Yamada List of files: /rk3399_rockchip-uboot/scripts/kconfig/Makefile

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

Mon, 11 Aug 2014 08:21:03 +0000

Merge branch 'master' of git://git.denx.de/u-boot-armConflicts: boards.cfgSigned-off-by: Stefano Babic List of files: /rk3399_rockchip-uboot/scripts/kconfig/Makefile

0a9064fb47bb0a239c04b0b63edebfdd3a201fdc - kconfig: import Kconfig files from Linux 3.16-rc7

Wed, 30 Jul 2014 05:08:13 +0000

kconfig: import Kconfig files from Linux 3.16-rc7Import - scripts/kconfig/* - include/linux/kconfig.hfrom Linux 3.16-rc7.Signed-off-by: Masahiro Yamada Reviewed-by: Simon Glass List of files: /rk3399_rockchip-uboot/scripts/kconfig/Makefile