Revision tags: v00.04.15, v00.04.14, v00.04.13, v00.04.12, v00.04.11, v00.04.10, v00.04.09, v00.04.08, v00.04.07, v00.04.06, v00.04.05, v00.04.04, v00.04.03, v00.04.02, v00.04.01, v00.04.00, v2021.04, v00.03.03, v2021.01, v2020.10, v2020.07, v00.02.13, v2020.04, v2020.01, v2019.10, v00.02.05, v00.02.04, v00.02.03, v00.02.02, v00.02.01, v2019.07, v00.02.00, v2019.04, v2018.07, v2018.03, v2018.01, v2017.11 |
|
#
d726f225 |
| 29-Jan-2017 |
Masahiro Yamada <yamada.masahiro@socionext.com> |
cmd: rework "license" command
The previous commit ("add a new command to show .config contents") improves the basic infrastructure of "embed a compressed file into the U-Boot image, and print it by
cmd: rework "license" command
The previous commit ("add a new command to show .config contents") improves the basic infrastructure of "embed a compressed file into the U-Boot image, and print it by a command". The same pattern for the "license" command.
This commit reworks the command to improve the following:
[1] Improve log style
Kbuild 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.h
instead 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" directory
Prior 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 to scatter related code.
[3] Drop the fixed-malloc size LICENSE_MAX
Just allocate the minimum required size of buffer because we know the size of the original gpl-2.0.txt.
[4] Fix more issues
Terminate the buffer with zero to prevent puts() from over-running. Add "static" to do_license.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Reviewed-by: Simon Glass <sjg@chromium.org>
show more ...
|
Revision tags: v2016.07, openbmc-20160624-1 |
|
#
8a7367ac |
| 15-Mar-2016 |
Tom Rini <trini@konsulko.com> |
cmd: Fix license command
The 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 rul
cmd: Fix license command
The 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 <yamada.masahiro@socionext.com> Signed-off-by: Tom Rini <trini@konsulko.com>
show more ...
|
Revision tags: v2016.01-rc1, v2015.10, v2015.10-rc5, v2015.10-rc4, v2015.10-rc3, v2015.10-rc2, v2015.10-rc1, v2015.07, v2015.07-rc3, v2015.07-rc2, v2015.07-rc1, v2015.04, v2015.04-rc5, v2015.04-rc4, v2015.04-rc3, v2015.04-rc2, v2015.04-rc1, v2015.01, v2015.01-rc4, v2015.01-rc3, v2015.01-rc2, v2015.01-rc1, v2014.10, v2014.10-rc3, v2014.10-rc2 |
|
#
e82abaeb |
| 11-Aug-2014 |
Stefano Babic <sbabic@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts: boards.cfg
Signed-off-by: Stefano Babic <sbabic@denx.de>
|
Revision tags: v2014.10-rc1 |
|
#
51148790 |
| 30-Jul-2014 |
Masahiro Yamada <yamada.m@jp.panasonic.com> |
kconfig: switch to Kconfig
This 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
kconfig: switch to Kconfig
This 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 is a 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 <board>_defconfig" to do the board configuration.
It will create the .config file and additionally spl/.config, tpl/.config if SPL, TPL is enabled, respectively.
You can use "make config", "make menuconfig" etc. to create a new .config or modify the existing one.
Use "make spl/config", "make spl/menuconfig" etc. for spl/.config and do likewise for tpl/.config file.
The generic syntax of configuration targets for SPL, TPL is:
<target_image>/<config_command>
Here, <target_image> is either 'spl' or 'tpl' <config_command> is 'config', 'menuconfig', 'xconfig', etc.
When the configuration is done, run "make". (Or "make <board>_defconfig all" will do the configuration and build in 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 generated for use in makefiles. It is still generated under include/, spl/include/, tpl/include/ directory for the Normal, SPL, TPL image, respectively.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Acked-by: Simon Glass <sjg@chromium.org>
show more ...
|
Revision tags: v2014.07, v2014.07-rc4, v2014.07-rc3, v2014.07-rc2, v2014.07-rc1, v2014.04, v2014.04-rc3, v2014.04-rc2 |
|
#
1ad6364e |
| 05-Mar-2014 |
Stefano Babic <sbabic@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-arm
|
#
3e113502 |
| 20-Feb-2014 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts: Makefile drivers/net/npe/Makefile
These two conflicts arise from commit 0b2d3f20 ("ARM: NET: Remove the IXP NPE ethernet driver")
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Conflicts: Makefile drivers/net/npe/Makefile
These two conflicts arise from commit 0b2d3f20 ("ARM: NET: Remove the IXP NPE ethernet driver") and are resolved by deleting the drivers/net/npe/Makefile file and removing the CONFIG_IXP4XX_NPE line from Makefile.
show more ...
|
Revision tags: v2014.04-rc1 |
|
#
2c92b1d6 |
| 04-Feb-2014 |
Masahiro Yamada <yamada.m@jp.panasonic.com> |
.gitignore: drop include/asm from ignored file list
Commit bb02c536 stopped creaing a symbolic link include/asm.
Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
|
Revision tags: v2014.01, v2014.01-rc3, v2014.01-rc2, v2014.01-rc1, v2013.10, v2013.10-rc4, v2013.10-rc3, v2013.10-rc2, v2013.10-rc1, v2013.07, v2013.07-rc3, v2013.07-rc2, v2013.07-rc1, v2013.04, v2013.04-rc3, v2013.04-rc2, v2013.04-rc1, v2013.01.01, v2013.01, v2013.01-rc3, v2013.01-rc2, v2013.01-rc1, v2012.10, v2012.10-rc3, v2012.10-rc2, v2012.10-rc1, v2012.07, v2012.07-rc3, v2012.07-rc2, v2012.07-rc1, v2012.04.01, v2012.04, v2012.04-rc3, v2012.04-rc2, v2012.04-rc1, v2011.12, v2011.12-rc3, v2011.12-rc2, v2011.12-rc1 |
|
#
bb82de88 |
| 16-Nov-2011 |
Wolfgang Denk <wd@denx.de> |
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: log
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
show more ...
|
#
9dfa8da7 |
| 16-Nov-2011 |
Wolfgang Denk <wd@denx.de> |
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: log
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
show more ...
|
#
c270730f |
| 20-Oct-2011 |
Che-Liang Chiou <clchiou@chromium.org> |
tools: logo: split bmp arrays from bmp_logo.h
The generated header bmp_logo.h is useful even outside common/lcd.c for the logo dimension. However, the problem is, the generated bmp_logo.h cannot be
tools: logo: split bmp arrays from bmp_logo.h
The generated header bmp_logo.h is useful even outside common/lcd.c for the logo dimension. However, the problem is, the generated bmp_logo.h cannot be included multiple times because bmp_logo_palette[] and bmp_logo_bitmap[] are defined in the bmp_logo.h.
This patch fixes this by defining these arrays in another header bmp_logo_data.h and in bmp_logo.h only declaring these arrays.
Signed-off-by: Che-Liang Chiou <clchiou@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Anatolij Gustschin <agust@denx.de>
show more ...
|
#
1b81f017 |
| 21-Oct-2011 |
Wolfgang Denk <wd@denx.de> |
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
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
show more ...
|
#
efb2172e |
| 10-Oct-2011 |
Simon Glass <sjg@chromium.org> |
Move timestamp and version files into 'generated' subdir
There is a rather subtle build problem where the build time stamp is not updated for out-of-tree builds if there exists an in-tree build whic
Move timestamp and version files into 'generated' subdir
There is a rather subtle build problem where the build time stamp is not updated for out-of-tree builds if there exists an in-tree build which has a valid timestamp file. So if you do an in-tree build, then an out-of-tree build your timestamp will not change.
The correct timestamp_autogenerated.h lives in the object tree, but it is not always found there. The source still lives in the source tree and when compiling version.h, it includes timestamp_autogenerated.h. Since the current directory is always searched first, this will come from the source tree rather than the object tree if it exists there. This affects dependency generation also, which means that common/cmd_version.o will not even 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 already used for asm-offsets.h. Then timestamp.h and version.h are updated to include the files from there.
There are other places where these generated files are included, but I cannot 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 have looked at various other options for fixing this, including sed on the dep files, -I- and -include flags to gcc, but I don't think they can be made to work. Comments welcome.
Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Mike Frysinger <vapier@gentoo.org>
show more ...
|
Revision tags: v2011.09, v2011.09-rc2, v2011.09-rc1, v2011.06, v2011.06-rc3, v2011.06-rc2, v2011.06-rc1, v2011.03, v2011.03-rc2, v2011.03-rc1, v2010.12, v2010.12-rc3, v2010.12-rc2, v2010.12-rc1, v2010.09, v2010.09-rc2, v2010.09-rc1, v2010.06, v2010.06-rc3, v2010.06-rc2 |
|
#
922d27b5 |
| 30-May-2010 |
Minkyu Kang <mk7.kang@samsung.com> |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts: arch/arm/include/asm/mach-types.h
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
|
Revision tags: v2010.06-rc1 |
|
#
f745817e |
| 27-Apr-2010 |
Mike Frysinger <vapier@gentoo.org> |
update include/asm/ gitignore after move
With the cpu include paths moved, the gitignore paths need updating.
Signed-off-by: Mike Frysinger <vapier@gentoo.org> Tested-by: Tom Rix <tom@bumblecow.com>
|
Revision tags: v2010.03, v2010.03-rc3, v2010.03-rc2, v2010.03-rc1, v2009.11.1, v2009.11, v2009.11-rc2, v2009.11-rc1, v2009.08, v2009.08-rc3, v2009.08-rc2, v2009.08-rc1, v2009.06, v2009.06-rc3, v2009.06-rc2, v2009.06-rc1, v2009.03, v2009.03-rc2, v2009.03-rc1 |
|
#
be4880eb |
| 21-Jan-2009 |
Kim Phillips <kim.phillips@freescale.com> |
Merge branch 'master' into next
|
Revision tags: v2009.01, v2009.01-rc3, v2009.01-rc2 |
|
#
cb547320 |
| 17-Dec-2008 |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> |
Merge branch 'fixes' into cleanups
Conflicts:
board/atmel/atngw100/atngw100.c board/atmel/atstk1000/atstk1000.c cpu/at32ap/at32ap700x/gpio.c include/asm-avr32/arch-at32ap700x/clk.h include/con
Merge branch 'fixes' into cleanups
Conflicts:
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
show more ...
|
Revision tags: v2009.01-rc1 |
|
#
561858ee |
| 03-Nov-2008 |
Peter Tyser <ptyser@xes-inc.com> |
Update U-Boot's build timestamp on every compile
Use the GNU 'date' command to auto-generate a new U-Boot timestamp on every compile.
Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
|
Revision tags: v2008.10, v2008.10-rc3, v2008.10-rc2, v2008.10-rc1, v1.3.4, v1.3.4-rc2, v1.3.4-rc1, v1.3.3 |
|
#
356cd17c |
| 09-May-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of /home/wd/git/u-boot/master/
|
#
878b3b1e |
| 04-May-2008 |
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> |
include/gitignore: update to all architectures
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
|
Revision tags: v1.3.3-rc3, v1.3.3-rc2, v1.3.3-rc1, v1.3.2, v1.3.2-rc3, v1.3.2-rc2 |
|
#
20c93959 |
| 21-Feb-2008 |
Marian Balakowicz <m8@semihalf.com> |
Merge branch 'master' of /home/git/u-boot
|
Revision tags: v1.3.2-rc1 |
|
#
6f99eec3 |
| 14-Feb-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://www.denx.de/git/u-boot-blackfin
Conflicts:
Makefile doc/README.standalone
Signed-off-by: Wolfgang Denk <wd@denx.de>
|
#
b45264ee |
| 04-Feb-2008 |
Mike Frysinger <vapier@gentoo.org> |
add gitignores for Blackfin pieces
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
#
8d79953d |
| 13-Jan-2008 |
Stefan Roese <sr@denx.de> |
Merge branch 'master' of /home/stefan/git/u-boot/u-boot
|
#
3b93020d |
| 09-Jan-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of /home/wd/git/u-boot/master/
|
#
6a40ef62 |
| 09-Jan-2008 |
Markus Klotzbuecher <mk@denx.de> |
Merge git://www.denx.de/git/u-boot
Conflicts:
board/tqm5200/tqm5200.c
|