#
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 ...
|
#
4d6647ab |
| 30-Nov-2016 |
Tom Rini <trini@konsulko.com> |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
|
#
6b29a395 |
| 29-Nov-2016 |
Tom Rini <trini@konsulko.com> |
Merge git://git.denx.de/u-boot-mpc85xx
|
#
8435aa77 |
| 17-Nov-2016 |
York Sun <york.sun@nxp.com> |
powerpc: P2020RDB-PC: Separate from P1_P2_RDB_PC in Kconfig Use TARGET_P2020RDB_PC instead of sharing with P1_P2_RDB_PC to simplify Kconfig and config macros. Remove macro CONFI
powerpc: P2020RDB-PC: Separate from P1_P2_RDB_PC in Kconfig Use TARGET_P2020RDB_PC instead of sharing with P1_P2_RDB_PC to simplify Kconfig and config macros. Remove macro CONFIG_P2020RDB. Signed-off-by: York Sun <york.sun@nxp.com>
show more ...
|
#
b0c98b4b |
| 17-Nov-2016 |
York Sun <york.sun@nxp.com> |
powerpc: P1025RDB: Separate from P1_P2_RDB_PC in Kconfig Use TARGET_P1025RDB instead of sharing with P1_P2_RDB_PC to simplify Kconfig and config macros. Remove macro CONFIG_P102
powerpc: P1025RDB: Separate from P1_P2_RDB_PC in Kconfig Use TARGET_P1025RDB instead of sharing with P1_P2_RDB_PC to simplify Kconfig and config macros. Remove macro CONFIG_P1025RDB. Signed-off-by: York Sun <york.sun@nxp.com>
show more ...
|
#
4eedabfe |
| 17-Nov-2016 |
York Sun <york.sun@nxp.com> |
powerpc: P1024RDB: Separate from P1_P2_RDB_PC in Kconfig Use TARGET_P1024RDB instead of sharing with TARGET_P1_P2_RDB_PC to simplify Kconfig and macros. Remove macro CONFIG_P102
powerpc: P1024RDB: Separate from P1_P2_RDB_PC in Kconfig Use TARGET_P1024RDB instead of sharing with TARGET_P1_P2_RDB_PC to simplify Kconfig and macros. Remove macro CONFIG_P1024RDB. Signed-off-by: York Sun <york.sun@nxp.com>
show more ...
|
#
da439db3 |
| 17-Nov-2016 |
York Sun <york.sun@nxp.com> |
powerpc: P1021RDB: Separate from P1_P2_RDB_PC in Kconfig Use TARGET_P1021RDB instead of sharing with TARGET_P1_P2_RDB_PC to simplify Kconfig and macros. Remove macro CONFIG_P102
powerpc: P1021RDB: Separate from P1_P2_RDB_PC in Kconfig Use TARGET_P1021RDB instead of sharing with TARGET_P1_P2_RDB_PC to simplify Kconfig and macros. Remove macro CONFIG_P1021RDB. Signed-off-by: York Sun <york.sun@nxp.com>
show more ...
|
#
e9bc8a8f |
| 17-Nov-2016 |
York Sun <york.sun@nxp.com> |
powerpc: P1020UTM: Separate from P1_P2_RDB_P2 in Kconfig Use TARGET_P1020UTM instead of sharing with TARGET_P1_P2_RDB_PC to simplify Kconfig and config macros. Remove macro CONF
powerpc: P1020UTM: Separate from P1_P2_RDB_P2 in Kconfig Use TARGET_P1020UTM instead of sharing with TARGET_P1_P2_RDB_PC to simplify Kconfig and config macros. Remove macro CONFIG_P1020UTM. Signed-off-by: York Sun <york.sun@nxp.com>
show more ...
|
#
f404b66c |
| 17-Nov-2016 |
York Sun <york.sun@nxp.com> |
powerpc: P1020RDB-PD: Separate from P1_P2_RDB_PC in Kconfig Use TARGET_P1020RDB_PD instead of sharing with P1_P2_RDB_PC to simplify Kconfig and config macros. Remove macro CONFI
powerpc: P1020RDB-PD: Separate from P1_P2_RDB_PC in Kconfig Use TARGET_P1020RDB_PD instead of sharing with P1_P2_RDB_PC to simplify Kconfig and config macros. Remove macro CONFIG_P1020RDB_PD. Signed-off-by: York Sun <york.sun@nxp.com>
show more ...
|
#
aa14620c |
| 17-Nov-2016 |
York Sun <york.sun@nxp.com> |
powerpc: P1020RDB-PC: Separate from P1_P2_RDB_PC in Kconfig Use TARGET_P1020RDB_PC instead of sharing with TARGET_P1_P2_RDB_PC to simplify Kconfig and config macros. Remove macr
powerpc: P1020RDB-PC: Separate from P1_P2_RDB_PC in Kconfig Use TARGET_P1020RDB_PC instead of sharing with TARGET_P1_P2_RDB_PC to simplify Kconfig and config macros. Remove macro CONFIG_P1020RDB_PC. Signed-off-by: York Sun <york.sun@nxp.com>
show more ...
|
#
fedae6eb |
| 17-Nov-2016 |
York Sun <york.sun@nxp.com> |
powerpc: P1020MBG: Separate from P1_P2_RDB_PC in Kconfig Use TARGET_P1020MBG instead of sharing with TARGET_P1_P2_RDB_PC to simplify Kconfig and other macros. Remove macro CONFI
powerpc: P1020MBG: Separate from P1_P2_RDB_PC in Kconfig Use TARGET_P1020MBG instead of sharing with TARGET_P1_P2_RDB_PC to simplify Kconfig and other macros. Remove macro CONFIG_P1020MBG. Signed-off-by: York Sun <york.sun@nxp.com>
show more ...
|
#
82d72a1b |
| 28-Jan-2016 |
Tom Rini <trini@konsulko.com> |
Merge branch 'master' of git://git.denx.de/u-boot-net
|
#
45fe3809 |
| 21-Jan-2016 |
Tom Rini <trini@konsulko.com> |
Merge branch 'master' of git://git.denx.de/u-boot-i2c; branch 'master' of git://git.denx.de/u-boot-nds32
|
#
e6ac28b6 |
| 19-Jan-2016 |
Tom Rini <trini@konsulko.com> |
Merge branch 'master' of git://git.denx.de/u-boot-video
|
#
5b8031cc |
| 14-Jan-2016 |
Tom Rini <trini@konsulko.com> |
Add more SPDX-License-Identifier tags In a number of places we had wordings of the GPL (or LGPL in a few cases) license text that were split in such a way that it wasn't caught previ
Add more SPDX-License-Identifier tags In a number of places we had wordings of the GPL (or LGPL in a few cases) license text that were split in such a way that it wasn't caught previously. Convert all of these to the correct SPDX-License-Identifier tag. Signed-off-by: Tom Rini <trini@konsulko.com>
show more ...
|
#
a891601c |
| 06-Jan-2014 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' Conflicts: include/micrel.h The conflict above was trivial, caused by four lines being added in both branch
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' Conflicts: include/micrel.h The conflict above was trivial, caused by four lines being added in both branches with different whitepace.
show more ...
|
#
f15ea6e1 |
| 10-Dec-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot/master' into 'u-boot-arm/master' Conflicts: arch/arm/cpu/armv7/rmobile/Makefile doc/README.scrapyard Needed manual fix: arch
Merge branch 'u-boot/master' into 'u-boot-arm/master' Conflicts: arch/arm/cpu/armv7/rmobile/Makefile doc/README.scrapyard Needed manual fix: arch/arm/cpu/armv7/omap-common/Makefile board/compulab/cm_t335/u-boot.lds
show more ...
|
#
f44483b5 |
| 02-Dec-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'serial' of git://git.denx.de/u-boot-microblaze
|
#
19210ae9 |
| 02-Dec-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-mips
|
#
77fdd6d1 |
| 02-Dec-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
|
#
5614e71b |
| 30-Sep-2013 |
York Sun <yorksun@freescale.com> |
Driver/DDR: Moving Freescale DDR driver to a common driver Freescale DDR driver has been used for mpc83xx, mpc85xx, mpc86xx SoCs. The similar DDR controllers will be used for ARM-based S
Driver/DDR: Moving Freescale DDR driver to a common driver Freescale DDR driver has been used for mpc83xx, mpc85xx, mpc86xx SoCs. The similar DDR controllers will be used for ARM-based SoCs. Signed-off-by: York Sun <yorksun@freescale.com>
show more ...
|
#
d44a5f51 |
| 22-Nov-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-microblaze/zynq' into 'u-boot-arm/master'
|
#
85b8c5c4 |
| 09-Nov-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'iu-boot/master' into 'u-boot-arm/master' Conflicts: arch/arm/cpu/arm926ejs/mxs/Makefile board/compulab/cm_t35/Makefile board/corscience/tric
Merge branch 'iu-boot/master' into 'u-boot-arm/master' Conflicts: arch/arm/cpu/arm926ejs/mxs/Makefile board/compulab/cm_t35/Makefile board/corscience/tricorder/Makefile board/ppcag/bg0900/Makefile drivers/bootcount/Makefile include/configs/omap4_common.h include/configs/pdnb3.h Makefile conflicts are due to additions/removals of object files on the ARM branch vs KBuild introduction on the main branch. Resolution consists in adjusting the list of object files in the main branch version. This also applies to two files which are not listed as conflicting but had to be modified: board/compulab/common/Makefile board/udoo/Makefile include/configs/omap4_common.h conflicts are due to the OMAP4 conversion to ti_armv7_common.h on the ARM side, and CONFIG_SYS_HZ removal on the main side. Resolution is to convert as this icludes removal of CONFIG_SYS_HZ. include/configs/pdnb3.h is due to a removal on ARM side. Trivial resolution is to remove the file. Note: 'git show' will also list two files just because they are new: include/configs/am335x_igep0033.h include/configs/omap3_igep00x0.h
show more ...
|
#
55aea84b |
| 22-Oct-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-sh
|