[U-Boot] Please pull u-boot-sunxi master (fixes for v2015.07)

[Hans de Goede <hdegoede@redhat.com>]

Hi,

On 06/30/2015 07:52 PM, Tom Rini wrote:
> On Tue, Jun 30, 2015 at 03:11:02PM +0200, Hans de Goede wrote:
>
>> Hi,
>>
>> On 28-06-15 18:06, Tom Rini wrote:
>>> On Sun, Jun 28, 2015 at 05:39:28PM +0200, Hans de Goede wrote:
>>>> Hi,
>>>>
>>>> On 26-06-15 23:05, Tom Rini wrote:
>>>>> On Fri, Jun 26, 2015 at 12:13:51PM +0200, Hans de Goede wrote:
>>>>>
>>>>>> Hi Tom,
>>>>>>
>>>>>> Please pull u-boot-sunxi/master into master for two bug-fixes,
>>>>>> and one new board:
>>>>>>
>>>>>> The following changes since commit 325849ff3d4adeebb8f8f9bc5db950724df9bc21:
>>>>>>
>>>>>>    Merge git://git.denx.de/u-boot-usb (2015-06-19 16:46:51 -0400)
>>>>>>
>>>>>> are available in the git repository at:
>>>>>>
>>>>>>    http://git.denx.de/u-boot-sunxi.git master
>>>>>>
>>>>>> for you to fetch changes up to cbf389d94bf300a38d0a26f5aab2efbc9d76a56c:
>>>>>>
>>>>>>    sunxi: Add Sinlinx SinA33 defconfig (2015-06-26 11:56:33 +0200)
>>>>>>
>>>>>
>>>>> NAK, this needs a rework now, sorry!  Joe's changes mean the new
>>>>> defconfig needs updating.
>>>>
>>>> Ugh, I'm somewhat surprised with these changes, both with the
>>>> contents of the changes, as with changes like these landing so
>>>> late in the cycle, esp. since these are not uncontroversial.
>>>>
>>>> I've the feeling that these were merged without proper discussion
>>>> which is not good, and is esp. bad when it is done so late in the
>>>> cycle.
>>>
>>> Yeah, it's a bit later than I'd have liked, but I asked Joe to get these
>>> done because they help clean things up.  For example:
>>>
>>>> In essense these changes revert my earlier commit where I explictly added:
>>>>
>>>> config CMD_SETEXPR
>>>> 	default y
>>>>
>>>> config CMD_NET
>>>> 	default y
>>>
>>> Right.  Your change kept sunxi boards from suddenly losing those
>>> features to prevent breakage (which is good, and why I allowed it at the
>>> time), but at the expense of adding lines to each of the sunxi defconfig
>>> files (which is why these lines ended up in each of the sunxi defconfg
>>> files, yes?)
>>
>> That is not how I see it, with my change for sunxi boards the default for
>> these options was y, so they did not end up in the deconfigs with Joe's
>> recent changes removed the above 4 lines from board/sunxi/Kconfig now
>> all of a sudden all sunxi defconfig files need these lines, it is Joe's
>> changes which have caused a ton of extra lines to be added to the sunxi
>> defconfigs not mine, specifically this commit:
>>
>> http://git.denx.de/?p=u-boot.git;a=commit;h=c9bb942e2f91d9f8e5f25ed1961eba2d64f65b8d
>>
>> Which does:
>>
>> --- a/board/sunxi/Kconfig
>> +++ b/board/sunxi/Kconfig
>> @@ -566,25 +566,4 @@ config GMAC_TX_DELAY
>>          ---help---
>>          Set the GMAC Transmit Clock Delay Chain value.
>>
>> -config SYS_MALLOC_CLEAR_ON_INIT
>> -       default n
>> -
>> -config NETDEVICES
>> -       default y
>> -
>> -config DM_ETH
>> -       default y
>> -
>> -config DM_SERIAL
>> -       default y
>> -
>> -config DM_USB
>> -       default y if !USB_MUSB_SUNXI
>> -
>> -config CMD_SETEXPR
>> -       default y
>> -
>> -config CMD_NET
>> -       default y
>> -
>>   endif
>>
>> Which result in the following "matching" change for 60+ sunxi
>> defconfig's :
>> --- a/configs/A10-OLinuXino-Lime_defconfig
>> +++ b/configs/A10-OLinuXino-Lime_defconfig
>> @@ -5,5 +5,13 @@ CONFIG_DRAM_CLK=480
>>   CONFIG_DRAM_EMR1=4
>>   CONFIG_SYS_CLK_FREQ=912000000
>>   CONFIG_DEFAULT_DEVICE_TREE="sun4i-a10-olinuxino-lime"
>> +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>>   CONFIG_SPL=y
>>   CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_EMAC,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
>> +CONFIG_CMD_SETEXPR=y
>> +CONFIG_CMD_NET=y
>> +CONFIG_DM_ETH=y
>> +CONFIG_NETDEVICES=y
>> +CONFIG_DM_SERIAL=y
>> +CONFIG_USB=y
>> +CONFIG_DM_USB=y
>
> OK, I see part of the problem.  One part of the problem, and this
> probably isn't just a sunxi thing, is that arch/arm/Kconfig::config
> ARCH_SUNXI hasn't been getting updated with select's like it should.
>
> If we do:
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 0829235..48319c1 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -646,6 +646,9 @@ config ARCH_SUNXI
>   	bool "Support sunxi (Allwinner) SoCs"
>   	select DM
>   	select DM_GPIO
> +	select DM_ETH
> +	select DM_SERIAL
> +	select DM_USB if USB_EHCI_HCD
>   	select OF_CONTROL
>   	select OF_SEPARATE
>   	select SPL_DISABLE_OF_CONTROL
>
> We get:
> diff --git a/configs/A20-OLinuXino-Lime2_defconfig b/configs/A20-OLinuXino-Lime2_defconfig
> index 6445b25..a8aa8d2 100644
> --- a/configs/A20-OLinuXino-Lime2_defconfig
> +++ b/configs/A20-OLinuXino-Lime2_defconfig
> @@ -8,12 +8,10 @@ CONFIG_USB0_VBUS_DET="PH5"
>   CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-olinuxino-lime2"
>   # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
>   CONFIG_SPL=y
> -CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3),USB_EHCI"
> +CONFIG_SYS_EXTRA_OPTIONS="AXP209_POWER,SUNXI_GMAC,RGMII,AHCI,SATAPWR=SUNXI_GPC(3)"
>   # CONFIG_CMD_IMLS is not set
>   # CONFIG_CMD_FLASH is not set
>   # CONFIG_CMD_FPGA is not set
> -CONFIG_DM_ETH=y
>   CONFIG_ETH_DESIGNWARE=y
> -CONFIG_DM_SERIAL=y
>   CONFIG_USB=y
> -CONFIG_DM_USB=y
> +CONFIG_USB_EHCI_HCD=y
>
> Which is much closer to what you were asking for, right Hans?  That
> still leaves CONFIG_SYS_MALLOC_CLEAR_ON_INIT=n being added in each case
> but that's a performance per-board tweak (and something that frankly we
> need to pencil in making a global change for).
>
> (And yes, I did a manual conversion from SYS_EXTRA_OPTIONS to
> USB_EHCI_HCD in there).

Right, I've been working on a patch doing pretty much the same tonight, but then for
all sunxi boards. I will post this patch later today, note this is intended for the
next cycle, for now lets just keep things as is in v2015.07-rc3 ,

Regards,

Hans