Changes in 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/doc/DocBook/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/doc/DocBook/Makefile

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

Thu, 15 May 2014 08:27:32 +0000

Merge branch 'master' of git://git.denx.de/u-boot-arm List of files: /rk3399_rockchip-uboot/doc/DocBook/Makefile

d2a3e911390f9fc4d8c0ee4b3c7fc75f4fd3fd19 - Merge branch 'u-boot/master'

Fri, 09 May 2014 08:47:05 +0000

Merge branch 'u-boot/master'Conflicts: drivers/net/Makefile(trivial merge) List of files: /rk3399_rockchip-uboot/doc/DocBook/Makefile

71ba24581c8b6fae2d6f04681c8a2fe310aec4c0 - kbuild: docbook: sync with Linux Kernel v3.15-rc1

Tue, 15 Apr 2014 04:30:51 +0000

kbuild: docbook: sync with Linux Kernel v3.15-rc1This commit imports DocBook-related updatesfrom v3.14 to v3.15-rc1. - commit ec3fadd64b9940baa2a369bf978e8561837db3f5 kbuild: docbook: use $(obj) and $(src) rather than specific path - commit 100da4c0150c97ce34d4d3b38bf2f5449b05ae4f kbuild: docbook: specify KERNELDOC dependency correctly - commit 6f89b9c1d6b29eaa600ac4a8ac1314b0d06f15e3 kbuild: docbook: include cmd files more simply - commit ac6d662a95a6989d83b259ccf8ec01dd7903af73 doc: Add "*.svg" to DocBook/.gitignore - commit 832919bfcf0cfd75767c68b0c61f7cf48be860a8 DocBook: Make mandocs parallel-safe - commit c4d79a4799719f2b0cd354ee498aad605730c97e work around xmlto bug in htmldocsSigned-off-by: Masahiro Yamada List of files: /rk3399_rockchip-uboot/doc/DocBook/Makefile

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

Wed, 05 Mar 2014 11:51:26 +0000

Merge branch 'master' of git://git.denx.de/u-boot-arm List of files: /rk3399_rockchip-uboot/doc/DocBook/Makefile

7424145f30c9ce9c40151765bd08029af7550f1d - kbuild: consolidate version and timestamp headers generation

Mon, 24 Feb 2014 02:12:09 +0000

kbuild: consolidate version and timestamp headers generation- Generate include/generated/{timestamp.h, version.h} more simply by using filechk rule. - Add $(UBOOTRELEASE) variable and re-write u-boot.imx rule more simply. - Rename U_BOOT_VERSION in Makefile to UBOOTVERSION Before this commit, the same variable name, "U_BOOT_VERSION" was used for two different strings. One of them was defined in Makefile. It takes the form like "2014.01-rc1" and used in makefiles and script files. The other is defined in include/generated/version.h It takes the form like "U-Boot 2014.01-rc1-00010-gbe6d426-dirty" and used in C and Aseembler. It is confusing when grepping the source tree. So, this commit renames the former to UBOOTVERSION.Signed-off-by: Masahiro Yamada List of files: /rk3399_rockchip-uboot/doc/DocBook/Makefile

3e11350255d9c5d4bd03c2a65769da84c05d3294 - Merge branch 'u-boot/master' into 'u-boot-arm/master'

Thu, 20 Feb 2014 12:16:05 +0000

Merge branch 'u-boot/master' into 'u-boot-arm/master'Conflicts: Makefile drivers/net/npe/MakefileThese two conflicts arise from commit 0b2d3f20("ARM: NET: Remove the IXP NPE ethernet driver") and areresolved by deleting the drivers/net/npe/Makefile fileand removing the CONFIG_IXP4XX_NPE line from Makefile. List of files: /rk3399_rockchip-uboot/doc/DocBook/Makefile

babb4440cfe1b8806cf2a5a3c5836196e501665d - kernel-doc: fix some errors

Wed, 05 Feb 2014 01:52:52 +0000

kernel-doc: fix some errors- Delete fs.xml from DOCBOOKS to fix an error. Commit e3ff797c added fs.xml to DOCBOOKS but missed to add doc/DocBook/fs.tmpl. - Fix the location of include guard in include/linker_lists.h.Signed-off-by: Masahiro Yamada Reported-by: Abraham Varricatt Acked-by: Simon Glass List of files: /rk3399_rockchip-uboot/doc/DocBook/Makefile

8fac9c7b7de617c52738818663adbbeb2021f132 - kernel-doc: move kernel-doc tools to scripts/

Wed, 05 Feb 2014 01:52:50 +0000

kernel-doc: move kernel-doc tools to scripts/tools/kernel-doc/docproc.c and tools/kernel-doc/kernel-doc arefiles imported from Linux Kernel.They originally resided under scripts/ directory in Linux Kernel.This commit moves them to the original location.Signed-off-by: Masahiro Yamada Acked-by: Simon Glass List of files: /rk3399_rockchip-uboot/doc/DocBook/Makefile

6825a95b0ba72c4e5667d02d8b31986e2e9abd5a - kbuild: use Linux Kernel build scripts

Tue, 04 Feb 2014 08:24:28 +0000

kbuild: use Linux Kernel build scriptsNow we are ready to switch over to real Kbuild.This commit disables temporary scripts: scripts/{Makefile.build.tmp, Makefile.host.tmp}and enables real Kbuild scripts: scripts/{Makefile.build,Makefile.host,Makefile.lib}.This switch is triggered by the line in scripts/Kbuild.include -build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build.tmp obj +build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build objWe need to adjust some build scripts for U-Boot.But smaller amount of modification is preferable.Additionally, we need to fix compiler flags which arelocally added or removed.In Kbuild, it is not allowed to change CFLAGS locally.Instead, ccflags-y, asflags-y, cppflags-y,CFLAGS_$(basetarget).o, CFLAGS_REMOVE_$(basetarget).oare prepared for that purpose.Signed-off-by: Masahiro Yamada Tested-by: Gerhard Sittig List of files: /rk3399_rockchip-uboot/doc/DocBook/Makefile

9e4140329ee9a787d0f96ac2829d618d47f7973f - kbuild: change out-of-tree build

Tue, 04 Feb 2014 08:24:24 +0000

kbuild: change out-of-tree buildThis commit changes the working directorywhere the build process occurs.Before this commit, build process occurred under the sourcetree for both in-tree and out-of-tree build.That's why we needed to add $(obj) prefix to all generatedfiles in makefiles like follows: $(obj)u-boot.bin: $(obj)u-bootHere, $(obj) is empty for in-tree build, whereas it pointsto the output directory for out-of-tree build.And our old build system changes the current working directorywith "make -C " syntax when descending into thesub-directories.On the other hand, Kbuild uses a different ideato handle out-of-tree build and directory descending.The build process of Kbuild always occurs under the output tree.When "O=dir/to/store/output/files" is given, the build systemchanges the current working directory to that directory andrestarts the make.Kbuild uses "make -f $(srctree)/scripts/Makefile.build obj="syntax for descending into sub-directories.(We can write it like "make $(obj)=" with a shorthand.)This means the current working directory is always the topof the output directory.Signed-off-by: Masahiro Yamada Tested-by: Gerhard Sittig List of files: /rk3399_rockchip-uboot/doc/DocBook/Makefile

93e1459641e758d2b096d3f1b39414a39bb314f8 - Coding Style cleanup: replace leading SPACEs by TABs

Fri, 04 Oct 2013 15:43:24 +0000

Coding Style cleanup: replace leading SPACEs by TABsSigned-off-by: Wolfgang Denk [trini: Drop changes for PEP 4 following python tools]Signed-off-by: Tom Rini List of files: /rk3399_rockchip-uboot/doc/DocBook/Makefile

96764df1b47ddebfb50fadf5af72530b07b5fc89 - Merge samsung, imx, tegra into u-boot-arm/master

Sat, 22 Dec 2012 10:59:14 +0000

Merge samsung, imx, tegra into u-boot-arm/masterThis commit merges branches from samsung, imx and tegrameant to fix merge issues between u-boot/master andu-boot-arm/master, as well as a few manual merge fixes. List of files: /rk3399_rockchip-uboot/doc/DocBook/Makefile

a098cf41fdb2a6607c675f7fe4f3164617c9367e - Merge remote-tracking branch 'u-boot/master' into u-boot-arm-merged

Wed, 19 Dec 2012 21:02:36 +0000

Merge remote-tracking branch 'u-boot/master' into u-boot-arm-mergedConflicts: README arch/arm/cpu/armv7/exynos/clock.c board/samsung/universal_c210/universal.c drivers/misc/Makefile drivers/power/power_fsl.c include/configs/mx35pdk.h include/configs/mx53loco.h include/configs/seaboard.h List of files: /rk3399_rockchip-uboot/doc/DocBook/Makefile

2c601c7208713ba9b2158c57adcf515f4bdbc212 - Merge branch 'master' of git://git.denx.de/u-boot into resolve

Mon, 10 Dec 2012 04:44:41 +0000

Merge branch 'master' of git://git.denx.de/u-boot into resolveConflicts: README board/samsung/universal_c210/universal.c drivers/misc/Makefile drivers/power/power_fsl.c include/configs/mx35pdk.h include/configs/mx53loco.h include/configs/seaboard.h List of files: /rk3399_rockchip-uboot/doc/DocBook/Makefile

05a860c228fe6c8f2e7aced8cc8ef88bc1038363 - Merge branch 'master' of git://git.denx.de/u-boot into master

Sat, 08 Dec 2012 11:02:45 +0000

Merge branch 'master' of git://git.denx.de/u-boot into masterConflicts: drivers/power/power_fsl.c include/configs/mx35pdk.h include/configs/mx53loco.h include/configs/woodburn_common.h board/woodburn/woodburn.cThese boards still use the old old PMIC framework, so theydo not merge properly after the power framework was merged intomainline.Fix all conflicts and update woodburn to use Power Framework.Signed-off-by: Stefano Babic List of files: /rk3399_rockchip-uboot/doc/DocBook/Makefile

e3ff797cdb3c4e4b2147013fa1b25a04ecc21fc4 - cbfs: Add docbook template

Mon, 05 Nov 2012 12:16:25 +0000

cbfs: Add docbook templateThis adds a docbook template for fs, and makes CBFS use it.Signed-off-by: Simon Glass List of files: /rk3399_rockchip-uboot/doc/DocBook/Makefile

3e4d27b06d7484040355e22eec2cbce7335d6dab - Merge git://git.denx.de/u-boot

Sat, 10 Nov 2012 07:05:54 +0000

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

47444a27d2d8fb5c9f2799345278f935d453ab5d - kerneldoc: tmpl: Implement template for LG-arrays

Fri, 12 Oct 2012 10:27:06 +0000

kerneldoc: tmpl: Implement template for LG-arraysImplement kerneldoc template for linker-generated arrays. This isthe first template in U-Boot that is used to generate kerneldocstyle documentation. This template is very basic.Signed-off-by: Marek Vasut List of files: /rk3399_rockchip-uboot/doc/DocBook/Makefile