Changes in .gitignore

d726f225f5eabc0efa1ef7006c4a6f840b28b767 - cmd: rework "license" command

Mon, 30 Jan 2017 02:12:08 +0000

cmd: rework "license" commandThe previous commit ("add a new command to show .config contents")improves the basic infrastructure of "embed a compressed file intothe U-Boot image, and print it by a command". The same pattern forthe "license" command.This commit reworks the command to improve the following:[1] Improve log styleKbuild style log GZIP cmd/license_data.gz CHK cmd/license_data_gz.h UPD cmd/license_data_gz.h CHK cmd/license_data_size.h UPD cmd/license_data_size.hinstead of the bare Make log:cat ./Licenses/gpl-2.0.txt | gzip -9 -c | \ tools/bin2header license_gzip > ./include/license.h[2] Collect related code into the "cmd" directoryPrior to this commit, the license.h was created by tools/Makefile,placed under the "include" directory, included from cmd/license.c,and deleted by the top-level Makefile. It is not a good idea toscatter related code.[3] Drop the fixed-malloc size LICENSE_MAXJust allocate the minimum required size of buffer because we knowthe size of the original gpl-2.0.txt.[4] Fix more issuesTerminate the buffer with zero to prevent puts() from over-running.Add "static" to do_license.Signed-off-by: Masahiro Yamada Reviewed-by: Simon Glass List of files: /rk3399_rockchip-uboot/include/.gitignore

8a7367accaaf88f90773a37fc9257d184bf448d2 - cmd: Fix license command

Tue, 15 Mar 2016 16:49:12 +0000

cmd: Fix license commandThe license command isn't usually built and has a few problems:- The rules to generate license.h haven't worked in a long time, re-write these based on the bmp_logo.h rules.- 'tok' is unused and the license text size has increased- bin2header.c wasn't grabbing unistd.h to know the prototype for read().Cc: Masahiro Yamada Signed-off-by: Tom Rini List of files: /rk3399_rockchip-uboot/include/.gitignore

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/include/.gitignore

51148790f26e42ef1fd4a1a8d056bf0252539525 - kconfig: switch to Kconfig

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

kconfig: switch to KconfigThis commit enables Kconfig.Going forward, we use Kconfig for the board configuration.mkconfig will never be used. Nor will include/config.mk be generated.Kconfig must be adjusted for U-Boot because our situation isa little more complicated than Linux Kernel.We have to generate multiple boot images (Normal, SPL, TPL)from one source tree.Each image needs its own configuration input.Usage:Run "make _defconfig" to do the board configuration.It will create the .config file and additionally spl/.config, tpl/.configif SPL, TPL is enabled, respectively.You can use "make config", "make menuconfig" etc. to createa new .config or modify the existing one.Use "make spl/config", "make spl/menuconfig" etc. for spl/.configand do likewise for tpl/.config file.The generic syntax of configuration targets for SPL, TPL is: /Here, is either 'spl' or 'tpl' is 'config', 'menuconfig', 'xconfig', etc.When the configuration is done, run "make".(Or "make _defconfig all" will do the configuration and buildin one time.)For futher information of how Kconfig works in U-Boot,please read the comment block of scripts/multiconfig.py.By the way, there is another item worth remarking here:coexistence of Kconfig and board herder files.Prior to Kconfig, we used C headers to define a set of configs.We expect a very long term to migrate from C headers to Kconfig.Two different infractructure must coexist in the interim.In our former configuration scheme, include/autoconf.mk was generatedfor use in makefiles.It is still generated under include/, spl/include/, tpl/include/ directoryfor the Normal, SPL, TPL image, respectively.Signed-off-by: Masahiro Yamada Acked-by: Simon Glass List of files: /rk3399_rockchip-uboot/include/.gitignore

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/include/.gitignore

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/include/.gitignore

2c92b1d6738c35236afaa3544d196a0d5ececa87 - .gitignore: drop include/asm from ignored file list

Wed, 05 Feb 2014 01:41:27 +0000

.gitignore: drop include/asm from ignored file listCommit bb02c536 stopped creaing a symbolic link include/asm.Signed-off-by: Masahiro Yamada List of files: /rk3399_rockchip-uboot/include/.gitignore

bb82de884005a869efeac4ae1b00891914d7c193 - Merge branch 'master' of /home/wd/git/u-boot/custodians

Wed, 16 Nov 2011 19:44:06 +0000

Merge branch 'master' of /home/wd/git/u-boot/custodians* 'master' of /home/wd/git/u-boot/custodians: api: export LCD device to external apps font: split font data from video_font.h tools: logo: split bmp arrays from bmp_logo.h lcd: add clear and draw bitmap declaration VIDEO: mx3fb: GCC4.6 fix build warnings Powerpc/DIU: Fixed the 800x600 and 1024x768 resolution bug List of files: /rk3399_rockchip-uboot/include/.gitignore

9dfa8da709a1589d177d99c597d9b18d8c9a145d - Merge branch 'master' of git://git.denx.de/u-boot-video

Wed, 16 Nov 2011 19:44:03 +0000

Merge branch 'master' of git://git.denx.de/u-boot-video* 'master' of git://git.denx.de/u-boot-video: api: export LCD device to external apps font: split font data from video_font.h tools: logo: split bmp arrays from bmp_logo.h lcd: add clear and draw bitmap declaration VIDEO: mx3fb: GCC4.6 fix build warnings Powerpc/DIU: Fixed the 800x600 and 1024x768 resolution bug List of files: /rk3399_rockchip-uboot/include/.gitignore

c270730f580e85ddab82e981abf8a518f78ae803 - tools: logo: split bmp arrays from bmp_logo.h

Thu, 20 Oct 2011 23:04:20 +0000

tools: logo: split bmp arrays from bmp_logo.hThe generated header bmp_logo.h is useful even outside common/lcd.c forthe logo dimension. However, the problem is, the generated bmp_logo.hcannot be included multiple times because bmp_logo_palette[] andbmp_logo_bitmap[] are defined in the bmp_logo.h.This patch fixes this by defining these arrays in another headerbmp_logo_data.h and in bmp_logo.h only declaring these arrays.Signed-off-by: Che-Liang Chiou Acked-by: Mike Frysinger Signed-off-by: Anatolij Gustschin List of files: /rk3399_rockchip-uboot/include/.gitignore

1b81f017b04b5a176f5f9230ec979f0f3c55ba5b - Merge branch 'master' of /home/wd/git/u-boot/master

Fri, 21 Oct 2011 21:35:12 +0000

Merge branch 'master' of /home/wd/git/u-boot/master* 'master' of /home/wd/git/u-boot/master: cosmetic: Fixup fixup_silent_linux() for checkpatch Correct dependency rule to fix SPL build Move timestamp and version files into 'generated' subdir sandbox: Makefile changes to build sandbox architecture Add generic gpio.h in asm-generic Adjust dependency rules to permit per-file flags sandbox: Use uintptr_t for 32/64-bit compatibility sandbox: Add basic config file sandbox: Add serial uart sandbox: Add main program sandbox: Add OS dependent layer sandbox: Force command sections to be 4-byte aligned sandbox: Disable standalone/API support sandbox: Disable built-in malloc sandbox: Add bootm support sandbox: Add board info for architecture sandbox: Add sandbox board sandbox: Add architecture lib files sandbox: Add cpu files sandbox: Add compiler defines to support a 64-bit x86_64 platform sandbox: Add architecture image support Fix use of int as pointer in image.c sandbox: Add architecture header files arm: ca9x4_ct_vxp: enable PXE BOOTP options support arm: ca9x4_ct_vxp: enable pxe command support Convert ca9x4_ct_vxp to standard env variables net: bootp: add PXE/RFC 4578 DHCP options support Add pxe command lib: add uuid_str_to_bin for use with bootp and PXE uuid README: document standard image variables Replace space and tab checks with isblank cosmetic: remove unneeded curly braces Add isblank common: add run_command2 for running simple or hush commands common, menu: use abortboot for menu timeout Add generic, reusable menu code DM9000:Add a byte swap macro for dm9000 io operation. kw_gpio: fix error in kw_gpio_direction_input Blackfin: bfin_spi: fix build error when DEBUG is defined Blackfin: define CONFIG_SYS_CACHELINE_SIZE video: Moving mx3fb.c to CONFIG_VIDEO mx31: make HSP clock for mx3fb driver available MX5: Make IPU display output and pixel format configurable VIDEO: MX5: export pix format VIDEO: MX5: Switch MX5 to CONFIG_VIDEO video: update the Freescale DIU driver to use linux/fb.h powerpc: cpm2 boards: update fcc register logic List of files: /rk3399_rockchip-uboot/include/.gitignore

efb2172ece93ef48f34fb8bdf963d3b72880cc7d - Move timestamp and version files into 'generated' subdir

Mon, 10 Oct 2011 08:55:19 +0000

Move timestamp and version files into 'generated' subdirThere is a rather subtle build problem where the build time stamp is notupdated for out-of-tree builds if there exists an in-tree build whichhas a valid timestamp file. So if you do an in-tree build, then anout-of-tree build your timestamp will not change.The correct timestamp_autogenerated.h lives in the object tree, but itis not always found there. The source still lives in the source tree andwhen compiling version.h, it includes timestamp_autogenerated.h. Sincethe current directory is always searched first, this will come from thesource tree rather than the object tree if it exists there. This affectsdependency generation also, which means that common/cmd_version.o will noteven be rebuilt if you have ever done an in-tree build.A similar problem exists with the version file.This change moves both files into the 'generated' subdir, which is alreadyused for asm-offsets.h. Then timestamp.h and version.h are updated toinclude the files from there.There are other places where these generated files are included, but Icannot see why these don't just use the timestamp.h and version.h headers.So this change also tidies that up.I have tested this with in- and out-of-tree builds, but not SPL. I havelooked at various other options for fixing this, including sed on the depfiles, -I- and -include flags to gcc, but I don't think they can be madeto work. Comments welcome.Signed-off-by: Simon Glass Acked-by: Mike Frysinger List of files: /rk3399_rockchip-uboot/include/.gitignore

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

Mon, 31 May 2010 00:13:11 +0000

Merge branch 'master' of git://git.denx.de/u-boot-armConflicts: arch/arm/include/asm/mach-types.hSigned-off-by: Minkyu Kang List of files: /rk3399_rockchip-uboot/include/.gitignore

f745817e741e4251afbd9d5d7f04b2419f4aa9d9 - update include/asm/ gitignore after move

Tue, 27 Apr 2010 18:15:34 +0000

update include/asm/ gitignore after moveWith the cpu include paths moved, the gitignore paths need updating.Signed-off-by: Mike Frysinger Tested-by: Tom Rix List of files: /rk3399_rockchip-uboot/include/.gitignore

be4880ebe4355e8782be4af4b337a1b98dffcbe3 - Merge branch 'master' into next

Thu, 22 Jan 2009 00:38:51 +0000

Merge branch 'master' into next List of files: /rk3399_rockchip-uboot/include/.gitignore

cb5473205206c7f14cbb1e747f28ec75b48826e2 - Merge branch 'fixes' into cleanups

Wed, 17 Dec 2008 15:53:07 +0000

Merge branch 'fixes' into cleanupsConflicts: board/atmel/atngw100/atngw100.c board/atmel/atstk1000/atstk1000.c cpu/at32ap/at32ap700x/gpio.c include/asm-avr32/arch-at32ap700x/clk.h include/configs/atngw100.h include/configs/atstk1002.h include/configs/atstk1003.h include/configs/atstk1004.h include/configs/atstk1006.h include/configs/favr-32-ezkit.h include/configs/hammerhead.h include/configs/mimc200.h List of files: /rk3399_rockchip-uboot/include/.gitignore

561858ee7d0274c3e89dc98d4d0698cb6fcf6fd9 - Update U-Boot's build timestamp on every compile

Mon, 03 Nov 2008 15:30:59 +0000

Update U-Boot's build timestamp on every compileUse the GNU 'date' command to auto-generate a new U-Boottimestamp on every compile.Signed-off-by: Peter Tyser List of files: /rk3399_rockchip-uboot/include/.gitignore

356cd17cc289e2dac409d21607618650d6f388a5 - Merge branch 'master' of /home/wd/git/u-boot/master/

Fri, 09 May 2008 20:18:58 +0000

Merge branch 'master' of /home/wd/git/u-boot/master/ List of files: /rk3399_rockchip-uboot/include/.gitignore

878b3b1e193e570caf3e96ad8e31e561f68d0287 - include/gitignore: update to all architectures

Sun, 04 May 2008 13:17:52 +0000

include/gitignore: update to all architecturesSigned-off-by: Jean-Christophe PLAGNIOL-VILLARD List of files: /rk3399_rockchip-uboot/include/.gitignore

20c93959330aba8b5bbdbfde1ef319e99eba235d - Merge branch 'master' of /home/git/u-boot

Thu, 21 Feb 2008 16:18:01 +0000

Merge branch 'master' of /home/git/u-boot List of files: /rk3399_rockchip-uboot/include/.gitignore