diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-01 20:52:51 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-07-01 20:52:51 +0200 |
| commit | 304f936aeaab0c3cc9d5af438fd3498ac7682991 (patch) | |
| tree | 6b50ccc855dff4717749974630d258ba786811d0 /boards.cfg | |
| parent | 019b57cc1d280c3768e2e8a7ff22e07a64c2f670 (diff) | |
| parent | 5287d595449512385e25f5afcb68a130bf08bae6 (diff) | |
| download | blackbird-obmc-uboot-304f936aeaab0c3cc9d5af438fd3498ac7682991.tar.gz blackbird-obmc-uboot-304f936aeaab0c3cc9d5af438fd3498ac7682991.zip | |
Merge remote-tracking branch 'u-boot-samsung/master'
Conflicts:
boards.cfg
Conflict was trivial between goni maintainer change and
lager_nor removal.
Diffstat (limited to 'boards.cfg')
| -rw-r--r-- | boards.cfg | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/boards.cfg b/boards.cfg index 24e3a9c158..8e2db8277e 100644 --- a/boards.cfg +++ b/boards.cfg @@ -289,6 +289,7 @@ Active arm armv7 exynos samsung origen Active arm armv7 exynos samsung smdk5250 smdk5250 - Chander Kashyap <k.chander@samsung.com> Active arm armv7 exynos samsung smdk5250 snow - Rajeshwari Shinde <rajeshwari.s@samsung.com> Active arm armv7 exynos samsung smdk5420 smdk5420 - Rajeshwari Shinde <rajeshwari.s@samsung.com> +Active arm armv7 exynos samsung smdk5420 peach-pit - Akshay Saraswat <akshay.s@samsung.com> Active arm armv7 exynos samsung smdkv310 smdkv310 - Chander Kashyap <k.chander@samsung.com> Active arm armv7 exynos samsung trats trats - Lukasz Majewski <l.majewski@samsung.com> Active arm armv7 exynos samsung trats2 trats2 - Piotr Wilczek <p.wilczek@samsung.com> @@ -368,7 +369,7 @@ Active arm armv7 rmobile atmark-techno armadillo-800eva Active arm armv7 rmobile kmc kzm9g kzm9g - Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>:Tetsuyuki Kobayashi <koba@kmckk.co.jp> Active arm armv7 rmobile renesas koelsch koelsch - Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Active arm armv7 rmobile renesas lager lager - Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> -Active arm armv7 s5pc1xx samsung goni s5p_goni - Przemyslaw Marczak <p.marczak@samsung.com> +Active arm armv7 s5pc1xx samsung goni s5p_goni - Robert Baldyga <r.baldyga@samsung.com> Active arm armv7 s5pc1xx samsung smdkc100 smdkc100 - Minkyu Kang <mk7.kang@samsung.com> Active arm armv7 socfpga altera socfpga socfpga_cyclone5 - - Active arm armv7 sunxi - sunxi Cubietruck sun7i:CUBIETRUCK,SPL,SUNXI_GMAC,RGMII - |
