Hi, On 03/21/2014 11:09 PM, Ian Campbell wrote:
<snip> >> Ok, so as promised I've already done a sync and here I've 2 branches for >> you at: https://github.com/jwrdegoede/u-boot-sunxi/ >> >> The first branch is: sunxi-v2014.04, this is u-boot-sunxi.git sunxi branch >> with v2014.04-rc2 merged in, essentially this is your >> sunxi-mainlining-cleanups >> with all the recent cleanups wens and you did added on top. > > You've reapplied all the cleanups to the existing merge, which is going > to cause confusion when we come to merge this back into > u-boot-sunxi.git. I redid the merge on top of the latest clean ups and > pushed it to: > git://gitorious.org/ijc/u-boot.git sunxi-merge-v2014.04-rc2 > > That one is suitable for merging back into u-boot-sunxi.git. OK. Note I've pushed a new version of my sun4i / sun5i work here, based on your v2 series (with the 2 cleanups you've posted merged in): https://github.com/jwrdegoede/u-boot-sunxi/commits/v2014.04-sunxi Other then rebasing I've not worked on the i2c remark I've received yet, nor bothered to run the series through checkpatch yet. But its there in case someone wants it for whatever reason. One thing that stands out when doing a diff against sunxi-merge-v2014.04-rc2 is this: --- u-boot/drivers/net/designware.c 2014-03-21 16:26:42.229522420 +0100 +++ u-boot-sunxi/drivers/net/designware.c 2014-03-22 17:21:51.907879720 + @@ -249,10 +249,10 @@ rx_descs_init(dev); tx_descs_init(dev); - writel(FIXEDBURST | PRIORXTX_41 | BURST_16, &dma_p->busmode); + writel(FIXEDBURST | PRIORXTX_41 | BURST_8, &dma_p->busmode); - writel(readl(&dma_p->opmode) | FLUSHTXFIFO | STOREFORWARD, - &dma_p->opmode); + writel(readl(&dma_p->opmode) | FLUSHTXFIFO | STOREFORWARD | + TXSECONDFRAME, &dma_p->opmode); writel(readl(&dma_p->opmode) | RXSTART | TXSTART, &dma_p->opmode); Which we should probably fix given that you've enabled gmac support. I also noticed that in include/configs/sunxi-common.h you've a formatting fix for the CONFIG_PHY_ADDR #define which is not yet in u-boot-sunxi. Regards, Hans -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
