| #
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
|
| #
ebba9d1d |
| 19-Jun-2017 |
Tom Rini <trini@konsulko.com> |
Merge branch 'master' of git://git.denx.de/u-boot-sunxi
|
| #
064b55cf |
| 13-Jun-2017 |
Heiko Schocher <hs@denx.de> |
powerpc, 5xxx, 512x: remove support for mpc5xxx and mpc512x
There was for long time no activity in the mpx5xxx area.
We need to go further and convert to Kconfig, but it
turned out,
powerpc, 5xxx, 512x: remove support for mpc5xxx and mpc512x
There was for long time no activity in the mpx5xxx area.
We need to go further and convert to Kconfig, but it
turned out, nobody is interested anymore in mpc5xxx,
so remove it.
Signed-off-by: Heiko Schocher <hs@denx.de>
show more ...
|
| #
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
|
| #
cb547320 |
| 17-Dec-2008 |
Haavard Skinnemoen <haavard.skinnemoen@atmel.com> |
Merge branch 'fixes' into cleanups
Conflicts:
board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
Merge branch 'fixes' into cleanups
Conflicts:
board/atmel/atngw100/atngw100.c
board/atmel/atstk1000/atstk1000.c
cpu/at32ap/at32ap700x/gpio.c
include/asm-avr32/arch-at32ap700x/clk.h
include/configs/atngw100.h
include/configs/atstk1002.h
include/configs/atstk1003.h
include/configs/atstk1004.h
include/configs/atstk1006.h
include/configs/favr-32-ezkit.h
include/configs/hammerhead.h
include/configs/mimc200.h
show more ...
|
| #
50bd0057 |
| 21-Oct-2008 |
Markus Klotzbuecher <mk@denx.de> |
Merge git://git.denx.de/u-boot into x1
Conflicts:
drivers/usb/usb_ohci.c
|
| #
f82642e3 |
| 18-Oct-2008 |
Wolfgang Denk <wd@denx.de> |
Merge 'next' branch
Conflicts:
board/freescale/mpc8536ds/mpc8536ds.c
include/configs/mgcoge.h
Signed-off-by: Wolfgang Denk <wd@denx.de>
|
| #
6d0f6bcf |
| 16-Oct-2008 |
Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> |
rename CFG_ macros to CONFIG_SYS
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
|
| #
4bbd4537 |
| 29-Sep-2006 |
Jon Loeliger <jdl@freescale.com> |
Merge branch 'mpc86xx'
|
| #
b440d0ef |
| 14-Sep-2006 |
Jon Loeliger <jdl@freescale.com> |
Merge branch 'mpc86xx'
|
| #
0855c50e |
| 29-Aug-2006 |
Jon Loeliger <jdl@freescale.com> |
Merge branch 'mpc86xx'
|
| #
42868896 |
| 29-Aug-2006 |
Jon Loeliger <jdl@freescale.com> |
Merge branch 'mpc86xx'
|
| #
34760e66 |
| 29-Aug-2006 |
Jon Loeliger <jdl@freescale.com> |
Merge branch 'mpc86xx'
|
| #
3a252208 |
| 25-Aug-2006 |
Jon Loeliger <jdl@freescale.com> |
Merge branch 'mpc86xx'
|
| #
41ec8b18 |
| 23-Aug-2006 |
Jon Loeliger <jdl@freescale.com> |
Merge branch 'mpc86xx'
|
| #
5e4c24bc |
| 23-Aug-2006 |
Jon Loeliger <jdl@freescale.com> |
Merge branch 'mpc86xx'
|
| #
ad09083c |
| 22-Aug-2006 |
Jon Loeliger <jdl@freescale.com> |
Merge branch 'mpc86xx'
|
| #
e80e82cb |
| 22-Aug-2006 |
Jon Loeliger <jdl@freescale.com> |
Merge branch 'mpc86xx'
|
| #
38546f08 |
| 22-Aug-2006 |
Jon Loeliger <jdl@freescale.com> |
Merge branch 'mpc86xx'
|
| #
f1f33de3 |
| 22-Aug-2006 |
Jon Loeliger <jdl@freescale.com> |
Merge branch 'mpc86xx'
|
| #
e862ed1c |
| 14-Aug-2006 |
Jon Loeliger <jdl@freescale.com> |
Merge branch 'mpc86xx'
|
| #
3754d698 |
| 09-Aug-2006 |
Jon Loeliger <jdl@freescale.com> |
Merge branch 'mpc86xx'
|
| #
281f69ed |
| 09-Aug-2006 |
Jon Loeliger <jdl@freescale.com> |
Merge branch 'wd'
|
| #
f6e5739a |
| 30-Jun-2006 |
Marian Balakowicz <m8@semihalf.com> |
Merge: Add support for AMCC 440SPe CPU based eval board (Yucca).
|