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?) and didn't help all of the other SoCs out. What Joe's changes do is remove them from the defconfig files under configs/ _and_ restore the original behaviour.
And not only does the just merged series revert these changes, to make things worse it adds a whole lot more crap to the sunxi defconfigs.
It does in that it's now a direct translation of crap that used to be in the config.h files (and done just once, true). The next step is to instead add smarts to the Kconfig logic so that if we don't have NOR-style flash we don't ever ask about CMD_IMLS/CMD_FLASH and make CMD_FPGA depend on FPGA being set.
We're trying to skip over the period of linux kernel history where the defconfig files were hand-controlled files that had lots of board-specific knowledge in them. But at the same time, we can't kick out nearly as much of that information as they were able to because...
Excuse my language but I've no other words for this, something which we want enabled on every single sunxi board does not belong in the defconfigs, we now have defconfig files where more of the lines are this crap / noise, rather then actual board config, we really need a better solution for providing per SoC defaults then just having them all in the defconfig, having them all in the defconfig is crazy, esp. as more and more compile time config gets moved into Kconfig.
The problem is that defconfig files are maintained by 'savedefconfig' and yes, perhaps we'll have to come up with something different than the solution the kernel did of "having stuff stored in defconfigs is annoying, lets move it to device trees". Maybe we need to be less strict than (how it seems to me about) how the kernel community is about settings defaults in Kconfig.
So once more I find both the contents and the time of merging of this patch-set ill advised, and I'm NOT happy with these changes.
I will take it into consideration that maybe I should be stricter about the merge window and treat things more like the kernel rules (everything goes in, in first two weeks) instead of how I had been doing things (everything ought to be posted close to, except for things that I ask people to get done based on other stuff..). Thanks for the feedback!