Hi,
On 05/25/2014 05:02 PM, Albert ARIBAUD wrote:
Hi Ian,
On Mon, 05 May 2014 11:52:02 +0100, Ian Campbell ijc@hellion.org.uk wrote:
This is my fifth attempt at an upstreamable series based upon the https://github.com/linux-sunxi/u-boot-sunxi.git#sunxi tree. The intention is to present a minimal starting point for upstreaming to which support for other processors, peripherals, boards etc can be added in the future. Therefore this has been stripped right back and currently supports only sun7i processors (AKA Allwinner A20) and the cubietruck board. Supported peripherals are UART, MMC and Ethernet.
The code here is from u-boot-sunxi.git#sunxi[0] changeset based on d9fe0a1e061e 3f5ff92b1503 "sunxi: add comments to pll1_para array." and applies to u-boot v2014.04. It merges cleanly into current mainline head.
As of v4 the majority of the series now has at least one Ack or Reviewed-by. In summary:
- sunxi: add sun7i clocks and timer support.
mT sunxi: add sun7i pinmux and gpio support M sunxi: add sun7i dram setup support M + sunxi: add sun7i cpu, board and start of day support MT sunxi: add support for Cubietruck booting in FEL mode M sunxi: add gmac Ethernet support M sunxi: mmc support M sunxi: non-FEL SPL boot support for sun7i
M==Reviewed-by Marek Vasut. m==Acked-by Marek Vasut. T==Reviewed-by Tom Rini +==Minor changes in v5
Changes in v5:
- Resynced with u-boot-sunxi.git 3f5ff92b1503 "sunxi: add comments to pll1_para array.". Dropped "Reduce DMA burst length" patch which is being handled elsewhere. Otherwise see individual commit logs for details.
Changes in v4:
- Resynced with u-boot-sunxi.git d9fe0a1e061e which pulled lots of fixes for Marek's review comments.
Global changes in v3:
- Rebased onto v2014.04 and resynced with u-boot-sunxi.git c89867dca2e9
- Improved commit messages
- Updated lists of contributors
- Added some CCs
- Lots of cleanup based on review comments.
Global changes in v2:
- Use SPDX-License-Identifier
- Resync with u-boot-sunxi.git
- Lot of updates to the individual patches, see the individual commit messages (checkpatch.pl fixes, magic number removal etc).
- Pulled the Ethernet stuff before the MMC and non-FEL boot stuff. The MMC stuff (which non-FEL boot needs) still needs some more cleanup, but the reordering means that the initial part of the series could in principal go in.
This series can also be found at:
git://gitorious.org/ijc/u-boot.git sunxi-mainlining-v5There is no SMP here, since that relies on the PSCI support from Marc Zyngier which has yet to land in mainline. Marc has recently rebased and a version based on this series can be found at:
git://gitorious.org/ijc/u-boot.git sunxi-mainlining-v5-smpI've tried to give corect credit and S-o-b based upon: git log --pretty='%aN' linux-sunxi/sunxi -- [PATHS] | sort -u git log linux-sunxi/sunxi -- [PATHS] | grep -i signed.off.by | sort -u Manual inspection
This will tend to over credit, since it will include folks who contributed code which has since been removed as well as those who contributed code which is not included in this patch set, but I think it is better to be conservative and include too many rather than incorrectly exclude people. Doing better than this would be IMHO too hard to be worth it (e.g. git blame would prefer a recent whitespace cleanup to the actual author of the code and prefer someone did code motion over the original author, so it would be a massive & manual process).
Applied (with manual fixes to minor 'git am' conflicts on ./boards.cfg and ./Makefile) to u-boot-arm/master, thanks!
Thank you too. I'm really happy to see this getting into u-boot proper. Beginner question, since this does not touch existing code, will it still go into the 2014.07 release ?
(now, to try and understand once more if and how this could be leveraged for A31 support...)
I've been working on a patch-series for adding sun4i and sun5i support, which has been almost done for 2 weeks now, seeing Ian's part of this effort merged surely motivates me to finish that work quickly :)
sun6i (aka A31) support unfortunately is a different story, once I've the sun4i / sun5i support series finished, I can relatively easy also give you a 2nd series adding the sun6i support which we have in the u-boot-sunxi git repository (the need for which will hopefully go away completely soon). But this support is incomplete, it needs allwinners boot0 and boot1 binaries to boot-strap u-boot, since we don't have dram setup code yet. With these binaries you should be able to be able to ie boot a Linux kernel with this u-boot, but it is not a standalone solution. Let me know if you're interested in receiving a series with this (incomplete) support.
I've given a friend of mine an mele A1000G quad to work on the dram setup code, I'll ping him on this.
Regards,
Hans