[U-Boot] Please pull u-boot-sunxi.git/master

Hi Albert,
Welcome back!
The following changes since commit 23f23f23d509e8e873797884456070c8a47d72b2:
socfpga: Relocate arch common functions away from board (2014-07-05 10:14:46 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-sunxi.git master
for you to fetch changes up to 7c48b015100eeff0e1bbb766394f7beca23afb48:
sunxi: use setbits_le32 to enable the DMA clock (2014-07-18 19:42:25 +0100)
---------------------------------------------------------------- Chen-Yu Tsai (1): sunxi: Add support for using MII phy-s with the GMAC nic
Hans de Goede (12): 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 mvtwsi: convert to CONFIG_SYS_I2C framework sunxi: Add i2c support sunxi: Add axp152 pmic support sunxi: Fix reset hang on sun5i
Henrik Nordstrom (1): sunxi: Add axp209 pmic support
Ian Campbell (4): sunxi: Avoid unused variable warning. sunxi: add Cubieboard2 support sunxi: add gpio driver sunxi: use setbits_le32 to enable the DMA clock
Jonathan Liu (1): sunxi: use random parts of SID to set ethaddr
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 | 41 ++++++- arch/arm/cpu/armv7/sunxi/clock_sun4i.c | 3 +- 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-fel.lds | 5 + arch/arm/cpu/armv7/sunxi/u-boot-spl.lds | 6 + arch/arm/include/asm/arch-kirkwood/config.h | 3 +- arch/arm/include/asm/arch-sunxi/gpio.h | 2 + arch/arm/include/asm/arch-sunxi/i2c.h | 15 +++ arch/arm/include/asm/arch-sunxi/timer.h | 5 + board/sunxi/Makefile | 4 + board/sunxi/board.c | 67 +++++++++++ board/sunxi/dram_a13_oli_micro.c | 32 ++++++ board/sunxi/dram_cubieboard.c | 31 ++++++ board/sunxi/dram_cubieboard2.c | 31 ++++++ board/sunxi/dram_r7dongle.c | 31 ++++++ board/sunxi/gmac.c | 11 ++ boards.cfg | 9 +- drivers/gpio/Makefile | 1 + drivers/gpio/sunxi_gpio.c | 102 +++++++++++++++++ drivers/i2c/Makefile | 2 +- drivers/i2c/mvtwsi.c | 88 ++++++++------- drivers/mmc/sunxi_mmc.c | 141 ++--------------------- drivers/net/Makefile | 2 +- drivers/net/{sunxi_wemac.c => sunxi_emac.c} | 140 +++++++++++------------ drivers/power/Makefile | 2 + drivers/power/axp152.c | 97 ++++++++++++++++ drivers/power/axp209.c | 167 ++++++++++++++++++++++++++++ include/axp152.h | 10 ++ include/axp209.h | 14 +++ include/configs/edminiv2.h | 3 +- include/configs/sun4i.h | 24 ++++ include/configs/sun5i.h | 24 ++++ include/configs/sun7i.h | 1 + include/configs/sunxi-common.h | 27 ++++- include/netdev.h | 2 +- tools/mksunxiboot.c | 10 +- 38 files changed, 1010 insertions(+), 264 deletions(-) create mode 100644 arch/arm/include/asm/arch-sunxi/i2c.h create mode 100644 board/sunxi/dram_a13_oli_micro.c create mode 100644 board/sunxi/dram_cubieboard.c create mode 100644 board/sunxi/dram_cubieboard2.c create mode 100644 board/sunxi/dram_r7dongle.c create mode 100644 drivers/gpio/sunxi_gpio.c rename drivers/net/{sunxi_wemac.c => sunxi_emac.c} (78%) create mode 100644 drivers/power/axp152.c create mode 100644 drivers/power/axp209.c create mode 100644 include/axp152.h create mode 100644 include/axp209.h create mode 100644 include/configs/sun4i.h create mode 100644 include/configs/sun5i.h

On Fri, 18 Jul 2014 20:14:11 +0100 Ian Campbell ijc@hellion.org.uk wrote:
Hi Albert,
Welcome back!
The following changes since commit 23f23f23d509e8e873797884456070c8a47d72b2:
socfpga: Relocate arch common functions away from board (2014-07-05 10:14:46 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-sunxi.git master
for you to fetch changes up to 7c48b015100eeff0e1bbb766394f7beca23afb48:
sunxi: use setbits_le32 to enable the DMA clock (2014-07-18 19:42:25 +0100)
Chen-Yu Tsai (1): sunxi: Add support for using MII phy-s with the GMAC nic
Hans de Goede (12): 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
Can we avoid pushing the sun4i and sun5i patches? They cause clean sunxi dram code rework more difficult.
Just to give an example. Here is what we have now in u-boot for the sunxi dram code (a very schematic example):
#ifdef SUN7I do_thing_a do_thing_b #endif do_thing_c
Here is what is done by the patches from Hans:
#ifdef SUN4I do_thing_b do_thing_a #endif #if defined(SUN5I) || defined(SUN7I) do_thing_a do_thing_b #endif do_thing_c
And here is what we actually want in the end to support all these SoC variants (with some tweaks and bugfixes for each of these steps):
do_thing_a do_thing_b do_thing_c
The reordering of the 'do_thing_a' and 'do_thing_b' operations is superfluous. And the fugly resulting ifdef hell does not look like a great improvement, even though the code kinda does the job.
Basically, if these patches are pushed, we have a bigger mess to clean compared to what we have now. Also if we have a messy support for sun4, sun5i and sun7i added first, then any future dram code rework needs to keep the dram functional on all of these SoC variant after every patch. This is rather inconvenient.
That's why I'm trying to first focus on the sun7i support alone with the patches: http://lists.denx.de/pipermail/u-boot/2014-July/183981.html And add the support for the other SoC variants only after the initial sun7i cleanup is done.
Is anyone really in a hurry to get this stuff pushed out of the u-boot-sunxi tree to upstream right now? Can't we get a 'testing' branch in the sunxi repository and have everything reviewed first?

On Fri, 2014-07-18 at 22:45 +0300, Siarhei Siamashka wrote:
Is anyone really in a hurry to get this stuff pushed out of the u-boot-sunxi tree to upstream right now? Can't we get a 'testing' branch in the sunxi repository and have everything reviewed first?
This sun4i and sun5i stuff has been on list since the very start of June without any of these concerns being raised, so I hardly think we can be accused of hurry with it or not having given ample opportunity for review.
Rebasing over boards.cfg changes dropping and changing boards is really pretty tedious and I've had to do a lot of it lately while preparing this PR so I'm not really very keen to rework it again to drop the sun4i and sun5i stuff. Therefore I'd much prefer if you would rebase the DRAM stuff onto these changes. Sorry.
Ian.

Hi Ian,
On Fri, 18 Jul 2014 20:14:11 +0100, Ian Campbell ijc@hellion.org.uk wrote:
Hi Albert,
Welcome back!
The following changes since commit 23f23f23d509e8e873797884456070c8a47d72b2:
socfpga: Relocate arch common functions away from board (2014-07-05 10:14:46 +0200)
are available in the git repository at:
git://git.denx.de/u-boot-sunxi.git master
for you to fetch changes up to 7c48b015100eeff0e1bbb766394f7beca23afb48:
sunxi: use setbits_le32 to enable the DMA clock (2014-07-18 19:42:25 +0100)
Chen-Yu Tsai (1): sunxi: Add support for using MII phy-s with the GMAC nic
Hans de Goede (12): 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 mvtwsi: convert to CONFIG_SYS_I2C framework sunxi: Add i2c support sunxi: Add axp152 pmic support sunxi: Fix reset hang on sun5i
Henrik Nordstrom (1): sunxi: Add axp209 pmic support
Ian Campbell (4): sunxi: Avoid unused variable warning. sunxi: add Cubieboard2 support sunxi: add gpio driver sunxi: use setbits_le32 to enable the DMA clock
Jonathan Liu (1): sunxi: use random parts of SID to set ethaddr
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 | 41 ++++++- arch/arm/cpu/armv7/sunxi/clock_sun4i.c | 3 +- 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-fel.lds | 5 + arch/arm/cpu/armv7/sunxi/u-boot-spl.lds | 6 + arch/arm/include/asm/arch-kirkwood/config.h | 3 +- arch/arm/include/asm/arch-sunxi/gpio.h | 2 + arch/arm/include/asm/arch-sunxi/i2c.h | 15 +++ arch/arm/include/asm/arch-sunxi/timer.h | 5 + board/sunxi/Makefile | 4 + board/sunxi/board.c | 67 +++++++++++ board/sunxi/dram_a13_oli_micro.c | 32 ++++++ board/sunxi/dram_cubieboard.c | 31 ++++++ board/sunxi/dram_cubieboard2.c | 31 ++++++ board/sunxi/dram_r7dongle.c | 31 ++++++ board/sunxi/gmac.c | 11 ++ boards.cfg | 9 +- drivers/gpio/Makefile | 1 + drivers/gpio/sunxi_gpio.c | 102 +++++++++++++++++ drivers/i2c/Makefile | 2 +- drivers/i2c/mvtwsi.c | 88 ++++++++------- drivers/mmc/sunxi_mmc.c | 141 ++--------------------- drivers/net/Makefile | 2 +- drivers/net/{sunxi_wemac.c => sunxi_emac.c} | 140 +++++++++++------------ drivers/power/Makefile | 2 + drivers/power/axp152.c | 97 ++++++++++++++++ drivers/power/axp209.c | 167 ++++++++++++++++++++++++++++ include/axp152.h | 10 ++ include/axp209.h | 14 +++ include/configs/edminiv2.h | 3 +- include/configs/sun4i.h | 24 ++++ include/configs/sun5i.h | 24 ++++ include/configs/sun7i.h | 1 + include/configs/sunxi-common.h | 27 ++++- include/netdev.h | 2 +- tools/mksunxiboot.c | 10 +- 38 files changed, 1010 insertions(+), 264 deletions(-) create mode 100644 arch/arm/include/asm/arch-sunxi/i2c.h create mode 100644 board/sunxi/dram_a13_oli_micro.c create mode 100644 board/sunxi/dram_cubieboard.c create mode 100644 board/sunxi/dram_cubieboard2.c create mode 100644 board/sunxi/dram_r7dongle.c create mode 100644 drivers/gpio/sunxi_gpio.c rename drivers/net/{sunxi_wemac.c => sunxi_emac.c} (78%) create mode 100644 drivers/power/axp152.c create mode 100644 drivers/power/axp209.c create mode 100644 include/axp152.h create mode 100644 include/axp209.h create mode 100644 include/configs/sun4i.h create mode 100644 include/configs/sun5i.h
Applied to u-boot-arm/master, thanks!
Amicalement,
participants (3)
-
Albert ARIBAUD
-
Ian Campbell
-
Siarhei Siamashka