diff options
| author | Tom Rini <trini@konsulko.com> | 2016-07-02 16:32:15 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-07-02 16:32:15 -0400 |
| commit | 8d24176a674a678d0421cf9c253eb848646f60e2 (patch) | |
| tree | da8d68584f46f09b1747005c5d4455284c019426 /board | |
| parent | 68f7289b4ff6daf8c7e9898d5f0eb8f0aaad7bba (diff) | |
| parent | d2a6af052845f671204ff978bc70bcfba8767cc9 (diff) | |
| download | u-boot-imx-8d24176a674a678d0421cf9c253eb848646f60e2.zip u-boot-imx-8d24176a674a678d0421cf9c253eb848646f60e2.tar.gz u-boot-imx-8d24176a674a678d0421cf9c253eb848646f60e2.tar.bz2 | |
Merge branch 'master' of http://git.denx.de/u-boot-sunxi
Diffstat (limited to 'board')
| -rw-r--r-- | board/sunxi/MAINTAINERS | 5 | ||||
| -rw-r--r-- | board/sunxi/board.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/board/sunxi/MAINTAINERS b/board/sunxi/MAINTAINERS index de5207e..d2dfebe 100644 --- a/board/sunxi/MAINTAINERS +++ b/board/sunxi/MAINTAINERS @@ -202,6 +202,11 @@ M: Siarhei Siamashka <siarhei.siamashka@gmail.com> S: Maintained F: configs/MSI_Primo81_defconfig +R16 EVB PARROT BOARD +M: Quentin Schulz <quentin.schulz@free-electrons.com> +S: Maintained +F: configs/parrot_r16_defconfig + SINLINX SINA31s BOARD M: Chen-Yu Tsai <wens@csie.org> S: Maintained diff --git a/board/sunxi/board.c b/board/sunxi/board.c index d09cf6d..c8bf316 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -529,7 +529,7 @@ void sunxi_board_init(void) #endif printf("DRAM:"); ramsize = sunxi_dram_init(); - printf(" %lu MiB\n", ramsize >> 20); + printf(" %d MiB\n", (int)(ramsize >> 20)); if (!ramsize) hang(); |