#
e8f80a5a |
| 09-May-2018 |
Tom Rini <trini@konsulko.com> |
Merge git://git.denx.de/u-boot-sunxi
|
#
83d290c5 |
| 06-May-2018 |
Tom Rini <trini@konsulko.com> |
SPDX: Convert all of our single license tags to Linux Kernel style When U-Boot started using SPDX tags we were among the early adopters and there weren't a lot of other examples to borro
SPDX: Convert all of our single license tags to Linux Kernel style When U-Boot started using SPDX tags we were among the early adopters and there weren't a lot of other examples to borrow from. So we picked the area of the file that usually had a full license text and replaced it with an appropriate SPDX-License-Identifier: entry. Since then, the Linux Kernel has adopted SPDX tags and they place it as the very first line in a file (except where shebangs are used, then it's second line) and with slightly different comment styles than us. In part due to community overlap, in part due to better tag visibility and in part for other minor reasons, switch over to that style. This commit changes all instances where we have a single declared license in the tag as both the before and after are identical in tag contents. There's also a few places where I found we did not have a tag and have introduced one. Signed-off-by: Tom Rini <trini@konsulko.com>
show more ...
|
#
5f5620ab |
| 12-Nov-2015 |
Stefano Babic <sbabic@denx.de> |
Merge git://git.denx.de/u-boot
|
#
ade766ac |
| 12-Nov-2015 |
Tom Rini <trini@konsulko.com> |
Merge branch 'next' of git://git.denx.de/u-boot-blackfin
|
#
cad04990 |
| 10-Nov-2015 |
Tom Rini <trini@konsulko.com> |
Merge branch 'master' of git://git.denx.de/u-boot-arm
|
#
da58dec8 |
| 09-Nov-2015 |
Tom Rini <trini@konsulko.com> |
Various Makefiles: Add SPDX-License-Identifier tags After consulting with some of the SPDX team, the conclusion is that Makefiles are worth adding SPDX-License-Identifier tags too, and m
Various Makefiles: Add SPDX-License-Identifier tags After consulting with some of the SPDX team, the conclusion is that Makefiles are worth adding SPDX-License-Identifier tags too, and most of ours have one. This adds tags to ones that lack them and converts a few that had full (or in one case, very partial) license blobs into the equivalent tag. Cc: Kate Stewart <kstewart@linuxfoundation.org> Signed-off-by: Tom Rini <trini@konsulko.com>
show more ...
|
#
1ad6364e |
| 05-Mar-2014 |
Stefano Babic <sbabic@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-arm
|
#
a7e8c15f |
| 25-Feb-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx With this, fixup a trivial build error of get_effective_memsize needing to be updated in the new board/freescale/p1010rdb/spl.c
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx With this, fixup a trivial build error of get_effective_memsize needing to be updated in the new board/freescale/p1010rdb/spl.c Signed-off-by: Tom Rini <trini@ti.com>
show more ...
|
#
4c89a369 |
| 21-Feb-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-spi
|
#
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:
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 ...
|
#
cbce795e |
| 04-Feb-2014 |
Masahiro Yamada <yamada.m@jp.panasonic.com> |
examples: move api/ and standalone/ entry to examples/Makefile Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
|
#
1129b14e |
| 23-Mar-2009 |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> |
Merge branch 'evk1100-prep'
|
#
8206bfae |
| 23-Mar-2009 |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> |
Merge branch 'mimc200'
|
#
014c595f |
| 08-Mar-2009 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx Conflicts: lib_ppc/board.c Signed-off-by: Wolfgang Denk <wd@denx.de>
|
#
89e372cd |
| 24-Feb-2009 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-mpc83xx
|
#
156feb90 |
| 23-Feb-2009 |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> |
Merge branch 'mimc200' into next Conflicts: board/mimc/mimc200/mimc200.c include/configs/mimc200.h
|
#
ea393eb1 |
| 23-Feb-2009 |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> |
Merge branch 'cleanups' into next
|
#
ad2d1639 |
| 22-Dec-2008 |
Mike Frysinger <vapier@gentoo.org> |
smc911x_eeprom: new example app for managing newer SMC parts A forward port of the last version to work with the newer smc911x driver. I only have a board with a LAN9218 part on it, so t
smc911x_eeprom: new example app for managing newer SMC parts A forward port of the last version to work with the newer smc911x driver. I only have a board with a LAN9218 part on it, so that is the only one I've tested. But there isn't anything in this that would make it terribly chip specific afaik. Signed-off-by: Mike Frysinger <vapier@gentoo.org> CC: Sascha Hauer <s.hauer@pengutronix.de> CC: Guennadi Liakhovetski <lg@denx.de> CC: Magnus Lilja <lilja.magnus@gmail.com> Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
show more ...
|
#
6c6e042a |
| 01-Feb-2009 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-arm
|
#
91eee546 |
| 14-Dec-2008 |
Dirk Behme <dirk.behme@googlemail.com> |
OMAP3: Add common board, interrupt and system info Add common board, interrupt and system info code. Signed-off-by: Dirk Behme <dirk.behme@googlemail.com>
|
#
e99e9575 |
| 31-Aug-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'Makefile' of git://git.denx.de/u-boot-arm
|
#
a13b2d93 |
| 31-Aug-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-arm
|
#
e155c9e0 |
| 31-Aug-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
|
#
de5b094d |
| 31-Aug-2008 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-sh
|
#
6ad43d0d |
| 31-Aug-2008 |
Nobuhiro Iwamatsu <iwamatsu@nigauri.org> |
sh: Add support SH2/SH2A which is CPU of Renesas Technology Add support SH2/SH2A basic function. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by:
sh: Add support SH2/SH2A which is CPU of Renesas Technology Add support SH2/SH2A basic function. Signed-off-by: Nobuhiro Iwamatsu <iwamatsu.nobuhiro@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
show more ...
|