#
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
|
#
50a327de |
| 17-Oct-2017 |
Masahiro Yamada <yamada.masahiro@socionext.com> |
lib: libfdt: wrap scripts/dtc/libfdt/* where possible lib/libfdt/ and scripts/dtc/libfdt have the same copies for the followings 6 files: fdt.c fdt_addresses.c fdt_empty_tree.c fdt
lib: libfdt: wrap scripts/dtc/libfdt/* where possible lib/libfdt/ and scripts/dtc/libfdt have the same copies for the followings 6 files: fdt.c fdt_addresses.c fdt_empty_tree.c fdt_overlay.c fdt_strerr.c fdt_sw.c Make them a wrapper of scripts/dtc/libfdt/*. This is exactly what Linux does to sync libfdt. In order to make is possible, import <linux/libfdt.h> and <linux/libfdt_env.h> from Linux 4.14-rc5. Unfortunately, U-Boot locally modified the following 3 files: fdt_ro.c fdt_wip.c fdt_rw.c The fdt_region.c is U-Boot own file. I did not touch them in order to avoid unpredictable impact. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.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>
|
#
92688a09 |
| 28-Mar-2017 |
Simon Glass <sjg@chromium.org> |
fdt: Bring in changes from v1.4.4 This a few minor changes down from upstream since the last sync. Signed-off-by: Simon Glass <sjg@chromium.org>
|
#
4f892924 |
| 28-Oct-2016 |
Tom Rini <trini@konsulko.com> |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: common/Kconfig configs/dms-ba16_defconfig
|
#
6637cb76 |
| 24-Oct-2016 |
Tom Rini <trini@konsulko.com> |
Merge git://git.denx.de/u-boot-fdt
|
#
610db705 |
| 17-Oct-2016 |
Maxime Ripard <maxime.ripard@free-electrons.com> |
libfdt: Sync overlay with upstream Now that the overlay code has been merge upstream, update our copy to what's been merged, since a significant number of issues have been fixed duri
libfdt: Sync overlay with upstream Now that the overlay code has been merge upstream, update our copy to what's been merged, since a significant number of issues have been fixed during the merge process. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Simon Glass <sjg@chromium.org>
show more ...
|
#
2313d484 |
| 20-Jun-2016 |
Tom Rini <trini@konsulko.com> |
Merge git://git.denx.de/u-boot-nand-flash
|
#
09849f4a |
| 20-Jun-2016 |
Tom Rini <trini@konsulko.com> |
Merge git://git.denx.de/u-boot-dm
|
#
6feed2a5 |
| 23-May-2016 |
Robert P. J. Day <rpjday@crashcourse.ca> |
lib/libfdt/: General aesthetic/style fixes. A number of style fixes across the files in this directory, including: * Correct invalid kernel-doc content. * Tidy up massive comm
lib/libfdt/: General aesthetic/style fixes. A number of style fixes across the files in this directory, including: * Correct invalid kernel-doc content. * Tidy up massive comment in fdt_region.c. * Use correct spelling of "U-Boot". * Replace tests of "! <var>" with "!<var>". * Replace "libfdt_env.h" with <libfdt_env.h>. Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Acked-by: Simon Glass <sjg@chromium.org>
show more ...
|
#
3be2bdf5 |
| 09-Oct-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx
|
#
5480ac32 |
| 11-Sep-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master' Conflicts: tools/Makefile
|
#
19d829fa |
| 05-Sep-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' Conflicts: drivers/serial/serial.c The conflict above was a trivial case of adding one init function in eac
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master' Conflicts: drivers/serial/serial.c The conflict above was a trivial case of adding one init function in each branch, and manually resolved in merge.
show more ...
|
#
e62d5fb0 |
| 04-Sep-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
|
#
4eef93da |
| 04-Sep-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
|
#
31043e20 |
| 03-Sep-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge branch 'u-boot-tegra/master' into 'u-boot-arm/master'
|
#
6d4511b2 |
| 03-Sep-2013 |
Albert ARIBAUD <albert.u.boot@aribaud.net> |
Merge 'u-boot-microblaze/zynq' into (u-boot-arm/master' Conflicts: arch/arm/include/asm/arch-zynq/hardware.h The conflict above was trivial and solved during merge.
|
#
e20cc2ca |
| 18-Aug-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://88.191.163.10/u-boot-arm Fixup an easy conflict over adding the clk_get prototype and USB_OTG defines for am33xx having moved. Conflicts:
Merge branch 'master' of git://88.191.163.10/u-boot-arm Fixup an easy conflict over adding the clk_get prototype and USB_OTG defines for am33xx having moved. Conflicts: arch/arm/include/asm/arch-am33xx/hardware.h Signed-off-by: Tom Rini <trini@ti.com>
show more ...
|
#
b98d9341 |
| 13-Aug-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-mpc85xx
|
#
c15438ea |
| 12-Aug-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://www.denx.de/git/u-boot-video
|
#
0daa1f69 |
| 12-Aug-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'fpga' of git://www.denx.de/git/u-boot-microblaze
|
#
b62af3df |
| 12-Aug-2013 |
Tom Rini <trini@ti.com> |
Merge branch 'master' of git://git.denx.de/u-boot-fdt
|
#
35084760 |
| 26-Jul-2013 |
Roger Meier <roger@bufferoverflow.ch> |
libfdt: SPDX-License-Identifier: GPL-2.0+ BSD-2-Clause Signed-off-by: Roger Meier <roger@bufferoverflow.ch> Acked-by: Wolfgang Denk <wd@denx.de>
|
#
0de71d50 |
| 12-Apr-2010 |
Peter Tyser <ptyser@xes-inc.com> |
Move libfdt/ into lib/ Move the libfdt directory into the common lib/ directory to clean up the top-level directory. Signed-off-by: Peter Tyser <ptyser@xes-inc.com>
|