diff options
| author | Tom Rini <trini@konsulko.com> | 2017-04-14 13:05:57 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-04-14 13:05:57 (GMT) |
| commit | c1a16c3ab541c014b029b42cc27cae496107e170 (patch) | |
| tree | e5da12851a4d920d9b79fa8547db9f479e506fed /board | |
| parent | af1b7286d8b2712cff5779d8a1565afed9d9d8e6 (diff) | |
| parent | 09397d99edb402c04d1e20b32989b5b2ecbb037a (diff) | |
| download | u-boot-c1a16c3ab541c014b029b42cc27cae496107e170.tar.xz | |
Merge branch 'master' of git://git.denx.de/u-boot-socfpga
Diffstat (limited to 'board')
| -rw-r--r-- | board/aries/mcvevk/MAINTAINERS (renamed from board/denx/mcvevk/MAINTAINERS) | 4 | ||||
| -rw-r--r-- | board/aries/mcvevk/Makefile (renamed from board/denx/mcvevk/Makefile) | 0 | ||||
| -rw-r--r-- | board/aries/mcvevk/qts/iocsr_config.h (renamed from board/denx/mcvevk/qts/iocsr_config.h) | 0 | ||||
| -rw-r--r-- | board/aries/mcvevk/qts/pinmux_config.h (renamed from board/denx/mcvevk/qts/pinmux_config.h) | 0 | ||||
| -rw-r--r-- | board/aries/mcvevk/qts/pll_config.h (renamed from board/denx/mcvevk/qts/pll_config.h) | 0 | ||||
| -rw-r--r-- | board/aries/mcvevk/qts/sdram_config.h (renamed from board/denx/mcvevk/qts/sdram_config.h) | 0 | ||||
| -rw-r--r-- | board/aries/mcvevk/socfpga.c (renamed from board/denx/mcvevk/socfpga.c) | 0 |
7 files changed, 2 insertions, 2 deletions
diff --git a/board/denx/mcvevk/MAINTAINERS b/board/aries/mcvevk/MAINTAINERS index 6787727..c3a3a2b 100644 --- a/board/denx/mcvevk/MAINTAINERS +++ b/board/aries/mcvevk/MAINTAINERS @@ -1,5 +1,5 @@ -SOCKIT BOARD -M: Marek Vasut <marex@denx.de> +Aries MCVEVK BOARD +M: Marek Vasut <marek.vasut@gmail.com> S: Maintained F: include/configs/socfpga_mcvevk.h F: configs/socfpga_mcvevk_defconfig diff --git a/board/denx/mcvevk/Makefile b/board/aries/mcvevk/Makefile index 86f9b78..86f9b78 100644 --- a/board/denx/mcvevk/Makefile +++ b/board/aries/mcvevk/Makefile diff --git a/board/denx/mcvevk/qts/iocsr_config.h b/board/aries/mcvevk/qts/iocsr_config.h index 3021830..3021830 100644 --- a/board/denx/mcvevk/qts/iocsr_config.h +++ b/board/aries/mcvevk/qts/iocsr_config.h diff --git a/board/denx/mcvevk/qts/pinmux_config.h b/board/aries/mcvevk/qts/pinmux_config.h index ea2f7ab..ea2f7ab 100644 --- a/board/denx/mcvevk/qts/pinmux_config.h +++ b/board/aries/mcvevk/qts/pinmux_config.h diff --git a/board/denx/mcvevk/qts/pll_config.h b/board/aries/mcvevk/qts/pll_config.h index b718b39..b718b39 100644 --- a/board/denx/mcvevk/qts/pll_config.h +++ b/board/aries/mcvevk/qts/pll_config.h diff --git a/board/denx/mcvevk/qts/sdram_config.h b/board/aries/mcvevk/qts/sdram_config.h index ff64f55..ff64f55 100644 --- a/board/denx/mcvevk/qts/sdram_config.h +++ b/board/aries/mcvevk/qts/sdram_config.h diff --git a/board/denx/mcvevk/socfpga.c b/board/aries/mcvevk/socfpga.c index 6be58f0..6be58f0 100644 --- a/board/denx/mcvevk/socfpga.c +++ b/board/aries/mcvevk/socfpga.c |