#
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 ...
|
#
6e6cf015 |
| 27-Nov-2017 |
Tom Rini <trini@konsulko.com> |
Merge git://www.denx.de/git/u-boot-imx Signed-off-by: Tom Rini <trini@konsulko.com>
|
#
29c49922 |
| 19-Nov-2017 |
Tom Rini <trini@konsulko.com> |
Merge git://git.denx.de/u-boot-dm
|
#
cb0060e8 |
| 23-Oct-2017 |
Patrice Chotard <patrice.chotard@st.com> |
mmc: arm_pl180_mmci: update arm_pl180_mmci_init() prototype Update arm_pl180_mmci_init() prototype by adding struct mmc** param. This is needed before converting this driver to driver mo
mmc: arm_pl180_mmci: update arm_pl180_mmci_init() prototype Update arm_pl180_mmci_init() prototype by adding struct mmc** param. This is needed before converting this driver to driver model in order to use arm_pl180_mmci_init() in driver model and in none driver model implementation Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
show more ...
|
#
821560fd |
| 27-Jun-2017 |
Tom Rini <trini@konsulko.com> |
Merge git://www.denx.de/git/u-boot-imx Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: include/configs/imx6qdl_icore_rqs.h include/configs/imx6ul_gea
Merge git://www.denx.de/git/u-boot-imx Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: include/configs/imx6qdl_icore_rqs.h include/configs/imx6ul_geam.h include/configs/imx6ul_isiot.h
show more ...
|
#
235c5b83 |
| 21-Jun-2017 |
Tom Rini <trini@konsulko.com> |
Merge branch 'master' of git://git.denx.de/u-boot-samsung
|
#
b9eaeae1 |
| 05-Jun-2017 |
Tom Rini <trini@konsulko.com> |
Merge git://git.denx.de/u-boot-usb
|
#
c62db35d |
| 31-May-2017 |
Simon Glass <sjg@chromium.org> |
arm: Add explicit include of <asm/mach-types.h> Rather than relying on common.h to provide this include, which is going away at some point, include it explicitly in each file. S
arm: Add explicit include of <asm/mach-types.h> Rather than relying on common.h to provide this include, which is going away at some point, include it explicitly in each file. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Tom Rini <trini@konsulko.com>
show more ...
|
#
16225590 |
| 13-Apr-2017 |
Tom Rini <trini@konsulko.com> |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx Drop CONFIG_STACKSIZE from include/configs/imx6_logic.h Signed-off-by: Tom Rini <trini@konsulko.com>
|
#
04735a8f |
| 08-Apr-2017 |
Tom Rini <trini@konsulko.com> |
Merge branch 'master' of git://git.denx.de/u-boot-samsung
|
#
d53ecad9 |
| 06-Apr-2017 |
Tom Rini <trini@konsulko.com> |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi trini: Disable CONFIG_SPL_USE_ARCH_MEMSET on orangepi_2 Signed-off-by: Tom Rini <trini@konsulko.com>
|
#
76b00aca |
| 31-Mar-2017 |
Simon Glass <sjg@chromium.org> |
board_f: Drop setup_dram_config() wrapper By making dram_init_banksize() return an error code we can drop the wrapper. Adjust this and clean up all implementations. Signed-off-b
board_f: Drop setup_dram_config() wrapper By making dram_init_banksize() return an error code we can drop the wrapper. Adjust this and clean up all implementations. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Stefan Roese <sr@denx.de>
show more ...
|
#
0e6b7a28 |
| 18-May-2015 |
Tom Rini <trini@konsulko.com> |
Merge git://git.denx.de/u-boot-samsung
|
#
9597494e |
| 14-May-2015 |
Tom Rini <trini@konsulko.com> |
Merge branch 'master' of git://git.denx.de/u-boot-tegra
|
#
104d6fb6 |
| 21-Apr-2015 |
Jan Kiszka <jan.kiszka@siemens.com> |
ARM: Clean up CONFIG_ARMV7_NONSEC/VIRT/PSCI conditions CONFIG_ARMV7_VIRT depends on CONFIG_ARMV7_NONSEC, thus doesn't need to be taken into account additionally. CONFIG_ARMV7_PSCI is onl
ARM: Clean up CONFIG_ARMV7_NONSEC/VIRT/PSCI conditions CONFIG_ARMV7_VIRT depends on CONFIG_ARMV7_NONSEC, thus doesn't need to be taken into account additionally. CONFIG_ARMV7_PSCI is only set on boards that support CONFIG_ARMV7_NONSEC, and it only works on those. CC: Tang Yuantian <Yuantian.Tang@freescale.com> CC: York Sun <yorksun@freescale.com> CC: Steve Rae <srae@broadcom.com> CC: Andre Przywara <andre.przywara@linaro.org> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Tested-by: Alison Wang <alison.wang@freescale.com> Signed-off-by: Tom Warren <twarren@nvidia.com>
show more ...
|
#
17998eff |
| 11-Feb-2014 |
Stefano Babic <sbabic@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-arm
|
#
0d746650 |
| 04-Feb-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'serial' of git://www.denx.de/git/u-boot-microblaze
|
#
f763be22 |
| 04-Feb-2014 |
Tom Rini <trini@ti.com> |
Merge branch 'net' of git://www.denx.de/git/u-boot-microblaze
|
#
e97f9d81 |
| 29-Jan-2014 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
|
#
c0cae2e2 |
| 28-Jan-2014 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-arm/next' into 'u-boot-arm/master'
|
#
de351d6b |
| 19-Dec-2013 |
Darwin Rambo <drambo@broadcom.com> |
lib: time: add weak timer_init() function If timer_init() is made a weak stub function, then it allows us to remove several empty timer_init functions for those boards that already h
lib: time: add weak timer_init() function If timer_init() is made a weak stub function, then it allows us to remove several empty timer_init functions for those boards that already have a timer initialized when u-boot starts. Architectures that use the timer framework may also remove the need for timer.c. Signed-off-by: Darwin Rambo <drambo@broadcom.com> Reviewed-by: Tim Kryger <tim.kryger@linaro.org>
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 ...
|
#
b3a7f22b |
| 04-Oct-2013 |
Rob Herring <rob.herring@calxeda.com> |
ARM: vexpress: convert to common timer code Convert vexpress to use the commmon timer code. Signed-off-by: Rob Herring <rob.herring@calxeda.com>
|