From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans de Goede Date: Mon, 09 Jun 2014 09:49:26 +0200 Subject: [U-Boot] [PULL u-boot-arm]: sunxi fixes + sun4i and sun5i support Message-ID: <53956706.7090000@redhat.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Albert, Please pull from my tree for various sunxi fixes + sun4i and sun5i support, all these patches have been reviewed and acked by Ian Campbell. I've not included the i2c and axp pmic patches from my previous posting of these series into this pull-req as these need more work. The following changes since commit 55e8250bd3cfd996d1caa04f520160a89ec04754: Merge branch 'master' of git://git.denx.de/u-boot-arm (2014-06-08 07:58:41 -0400) are available in the git repository at: git://github.com/jwrdegoede/u-boot-sunxi.git sunxi-for-albert for you to fetch changes up to e3dc508420eb8074b003d18a5177b5bd9ec6961c: sunxi: Add Ian Campbell and Hans de Goede as cubietruck board-maintainers (2014-06-09 08:50:20 +0200) ---------------------------------------------------------------- Chen-Yu Tsai (1): sunxi: Add support for using MII phy-s with the GMAC nic Hans de Goede (8): sunxi: mksunxiboot: Fix loading of files with a size which is not a multiple of 4 sunxi: Fix u-boot-spl.lds to refer to .vectors sunxi: Remove mmc DMA support sunxi: Implement reset_cpu sunxi: Add sun4i support sunxi: Add sun5i support sunxi: Add emac glue, enable emac on the cubieboard sunxi: Add Ian Campbell and Hans de Goede as cubietruck board-maintainers Stefan Roese (1): net: Rename and cleanup sunxi (Allwinner) emac driver arch/arm/cpu/armv7/sunxi/Makefile | 4 + arch/arm/cpu/armv7/sunxi/board.c | 27 ++++++ arch/arm/cpu/armv7/sunxi/cpu_info.c | 15 +++ arch/arm/cpu/armv7/sunxi/dram.c | 102 +++++++++++++++++++- arch/arm/cpu/armv7/sunxi/u-boot-spl.lds | 1 + arch/arm/include/asm/arch-sunxi/timer.h | 5 + board/sunxi/Makefile | 3 + board/sunxi/dram_a13_oli_micro.c | 32 +++++++ board/sunxi/dram_cubieboard.c | 31 ++++++ board/sunxi/dram_r7dongle.c | 31 ++++++ board/sunxi/gmac.c | 11 +++ boards.cfg | 7 +- drivers/mmc/sunxi_mmc.c | 140 ++-------------------------- drivers/net/Makefile | 2 +- drivers/net/{sunxi_wemac.c => sunxi_emac.c} | 140 ++++++++++++++-------------- include/configs/sun4i.h | 23 +++++ include/configs/sun5i.h | 23 +++++ include/configs/sunxi-common.h | 8 +- include/netdev.h | 2 +- tools/mksunxiboot.c | 10 +- 20 files changed, 397 insertions(+), 220 deletions(-) create mode 100644 board/sunxi/dram_a13_oli_micro.c create mode 100644 board/sunxi/dram_cubieboard.c create mode 100644 board/sunxi/dram_r7dongle.c rename drivers/net/{sunxi_wemac.c => sunxi_emac.c} (78%) create mode 100644 include/configs/sun4i.h create mode 100644 include/configs/sun5i.h Thanks & Regards, Hans