#
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 ...
|
#
194eded1 |
| 04-Dec-2016 |
Tom Rini <trini@konsulko.com> |
Merge git://git.denx.de/u-boot-mpc85xx
|
#
73eed452 |
| 03-Dec-2016 |
Tom Rini <trini@konsulko.com> |
Merge branch 'master' of git://www.denx.de/git/u-boot-dm
|
#
9ec4a67e |
| 27-Nov-2016 |
Vladimir Zapolskiy <vz@mleia.com> |
sh: place board lowlevel_init code in the beginning of .text Reference lowlevel_init of all supported SH2A/SH3/SH4/SH4A boards from a shared linker script, the lowlevel_init function wil
sh: place board lowlevel_init code in the beginning of .text Reference lowlevel_init of all supported SH2A/SH3/SH4/SH4A boards from a shared linker script, the lowlevel_init function will be called by a relative address. Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> Reviewed-by: Simon Glass <sjg@chromium.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 ...
|
#
c0bb110b |
| 04-Nov-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-blackfin Easy to resolve conflict on the GPIO change. Conflicts: arch/blackfin/cpu/Makefile Signed-off-by: Tom
Merge branch 'master' of git://git.denx.de/u-boot-blackfin Easy to resolve conflict on the GPIO change. Conflicts: arch/blackfin/cpu/Makefile Signed-off-by: Tom Rini <trini@ti.com>
show more ...
|
#
02b3bf39 |
| 20-Oct-2013 |
Masahiro Yamada <yamada.m@jp.panasonic.com> |
sh: convert makefiles to Kbuild style Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
|
#
3be2bdf5 |
| 09-Oct-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx
|
#
326ea986 |
| 31-Jul-2013 |
Stefano Babic <sbabic@denx.de> |
Merge git://git.denx.de/u-boot-arm Conflicts: board/freescale/mx6qsabrelite/Makefile board/freescale/mx6qsabrelite/mx6qsabrelite.c include/configs/mx6qsab
Merge git://git.denx.de/u-boot-arm Conflicts: board/freescale/mx6qsabrelite/Makefile board/freescale/mx6qsabrelite/mx6qsabrelite.c include/configs/mx6qsabrelite.h Signed-off-by: Stefano Babic <sbabic@denx.de>
show more ...
|
#
5b9c79a8 |
| 26-Jul-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash
|
#
8b485ba1 |
| 25-Jul-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot/master' into u-boot-arm/master
|
#
aaf5e825 |
| 25-Jul-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-nds32
|
#
c2120fbf |
| 24-Jul-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-i2c The sandburst-specific i2c drivers have been deleted, conflict was just over the SPDX conversion. Conflicts: bo
Merge branch 'master' of git://git.denx.de/u-boot-i2c The sandburst-specific i2c drivers have been deleted, conflict was just over the SPDX conversion. Conflicts: board/sandburst/common/ppc440gx_i2c.c board/sandburst/common/ppc440gx_i2c.h Signed-off-by: Tom Rini <trini@ti.com>
show more ...
|
#
1a459660 |
| 08-Jul-2013 |
Wolfgang Denk <wd@denx.de> |
Add GPL-2.0+ SPDX-License-Identifier to source files Signed-off-by: Wolfgang Denk <wd@denx.de> [trini: Fixup common/cmd_io.c] Signed-off-by: Tom Rini <trini@ti.com>
|
#
fedab338 |
| 07-Jun-2012 |
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: video: atmel/lcd: add LCD driver for new Atmel SoC video: cfb_console: flush
Merge branch 'master' of git://git.denx.de/u-boot-video * 'master' of git://git.denx.de/u-boot-video: video: atmel/lcd: add LCD driver for new Atmel SoC video: cfb_console: flush dcache for frame buffer in DRAM cfb_console: Ignore bell character cfb_console: Add console_clear_line function cfb_console: Fix function console_back omap3_dss: cosmetic changes omap3_dss: add optional framebuffer mx53loco: Add LCD support mx5: Rename mx51_fb_init() mx53: Allow IPUv3 driver to also work on mx53 mx51evk: Add LCD support EXYNOS: display 32bpp bitmap TIZEN logo create lib/tizen directory LCD: display 32bpp decompressed bitmap image common/lcd.c: reduce one CONFIG_LCD_LOGO ifdef common/lcd.c: reduce some CONFIG_LCD_*_LOGO ifdefs common/lcd.c: use ARRAY_SIZE cmd_bmp.c: make bmp_display() usable by drivers or board code LCD: support another s6e8ax0 panel type LCD: change s6e8ax0 panel gamma value include/video.h: drop unused video_printf() Signed-off-by: Wolfgang Denk <wd@denx.de>
show more ...
|
#
74b5b5db |
| 07-Jun-2012 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-avr32 * 'master' of git://git.denx.de/u-boot-avr32: avr32:board.c: fix compile warning avr32:grasshopper: fix PHY initialisation
Merge branch 'master' of git://git.denx.de/u-boot-avr32 * 'master' of git://git.denx.de/u-boot-avr32: avr32:board.c: fix compile warning avr32:grasshopper: fix PHY initialisation Signed-off-by: Wolfgang Denk <wd@denx.de>
show more ...
|
#
d1c6e9e4 |
| 07-Jun-2012 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-mips * 'master' of git://git.denx.de/u-boot-mips: MIPS: board.c: move extern declarations to u-boot-mips.h MIPS: bootm_qemu_mips
Merge branch 'master' of git://git.denx.de/u-boot-mips * 'master' of git://git.denx.de/u-boot-mips: MIPS: board.c: move extern declarations to u-boot-mips.h MIPS: bootm_qemu_mips.c: make checkpatch.pl clean MIPS: bootm.c: make checkpatch.pl clean Signed-off-by: Wolfgang Denk <wd@denx.de>
show more ...
|
#
76aef69e |
| 07-Jun-2012 |
Wolfgang Denk <wd@denx.de> |
Merge branch 'master' of git://git.denx.de/u-boot-sh * 'master' of git://git.denx.de/u-boot-sh: sh/ap_sh4a_4a: Fix typo of operator in ET0_ETXD4 sh: Add SH7269 device and RSK2+SH
Merge branch 'master' of git://git.denx.de/u-boot-sh * 'master' of git://git.denx.de/u-boot-sh: sh/ap_sh4a_4a: Fix typo of operator in ET0_ETXD4 sh: Add SH7269 device and RSK2+SH7269 board sh: Set CONFIG_SH_ETHER_PHY_MODE and CONFIG_SH_ETHER_SH7734_MII to boards with sh_eth sh: Add support for AP-SH4A-4A board sh: Add register definition of PFC for SH7734 sh: r0p7734: Add support I2C controller sh: Add bit control functions sh: Add support for r0p7734 board sh: Add support Renesas SH7734 Signed-off-by: Wolfgang Denk <wd@denx.de>
show more ...
|
#
99744b7e |
| 15-May-2012 |
Phil Edworthy <PHIL.EDWORTHY@renesas.com> |
sh: Add SH7269 device and RSK2+SH7269 board This is an sh2a device (max 266MHz) with FPU, video display controller (VDC), 8 serial ports, 4 I2C channels, 3 CAN ports, SD and on-chip
sh: Add SH7269 device and RSK2+SH7269 board This is an sh2a device (max 266MHz) with FPU, video display controller (VDC), 8 serial ports, 4 I2C channels, 3 CAN ports, SD and on-chip USB. The RSK2+SH7269 board uses the SH7269 processor. It is often referred to as just rsk7269. Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
show more ...
|