Pull request: u-boot-sunxi/master
Hi Tom,
Please pull this PR.
thanks!
Jagan
The following changes since commit b24cf8540a85a9bf97975aadd6a7542f166c78a3:
video: mxsfb: Fix reset hang when videomode variable is not present (2017-02-22 21:47:59 +0100)
are available in the git repository at:
git://git.denx.de/u-boot-sunxi.git master
for you to fetch changes up to 35affe7698e95c058a1f6c7eb2e1bf35f82461c9:
sunxi: add NanoPi NEO Air defconfig (2017-02-25 13:54:15 +0530)
----------------------------------------------------------------
Andre Przywara (12):
sunxi: fix ACTLR.SMP assembly routine
ARM: rename CONFIG_TIMER_CLK_FREQ to COUNTER_FREQUENCY
fsl: ls102x: remove redundant GENERIC_TIMER_CLK
sunxi: simplify ACTLR.SMP bit set #ifdef
sunxi: configs: merge sun9i and sun50i SPL memory definitions
sunxi: Kconfig: introduce CONFIG_SUNXI_HIGH_SRAM
sunxi: provide ARMv8 mem_map for every ARM64 board
SPI: SPL: sunxi: fix 64-bit build
sunxi: DRAM: add Allwinner H5 support
sunxi: prepare for sharing MACH_SUN8I_H3 config symbol
sunxi: introduce Allwinner H5 config option
sunxi: Add OrangePi PC 2 initial support
Jelle van der Waa (1):
sunxi: add NanoPi NEO Air defconfig
arch/arm/Kconfig | 4 + arch/arm/cpu/armv7/ls102xa/psci.S | 2 +- arch/arm/cpu/armv7/ls102xa/timer.c | 2 +- arch/arm/cpu/armv7/nonsec_virt.S | 4 +- arch/arm/cpu/armv7/sunxi/psci.c | 2 +- arch/arm/dts/Makefile | 5 +- arch/arm/dts/sun50i-h5-orangepi-pc2.dts | 147 ++++++++++++++++++++++++++ arch/arm/dts/sun8i-h3-nanopi-neo-air.dts | 97 +++++++++++++++++ arch/arm/include/asm/arch-sunxi/clock_sun6i.h | 4 +- arch/arm/include/asm/arch-sunxi/cpu.h | 1 + arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 4 +- arch/arm/include/asm/arch-sunxi/dram.h | 2 +- arch/arm/include/asm/arch-sunxi/spl.h | 2 +- arch/arm/mach-sunxi/Makefile | 2 +- arch/arm/mach-sunxi/board.c | 12 +-- arch/arm/mach-sunxi/clock_sun6i.c | 6 +- arch/arm/mach-sunxi/cpu_info.c | 2 + arch/arm/mach-sunxi/dram_sun8i_h3.c | 97 ++++++++++++++--- arch/arm/mach-sunxi/usb_phy.c | 4 +- board/sunxi/Kconfig | 35 +++++- board/sunxi/MAINTAINERS | 5 + board/sunxi/board.c | 6 +- configs/nanopi_neo_air_defconfig | 17 +++ configs/orangepi_pc2_defconfig | 19 ++++ drivers/mtd/spi/Kconfig | 2 +- drivers/mtd/spi/sunxi_spi_spl.c | 16 +-- drivers/net/sun8i_emac.c | 2 +- drivers/power/Kconfig | 4 +- drivers/usb/host/ehci-sunxi.c | 2 +- include/configs/exynos-common.h | 2 +- include/configs/ls1021aiot.h | 7 +- include/configs/ls1021aqds.h | 7 +- include/configs/ls1021atwr.h | 7 +- include/configs/mx7_common.h | 2 +- include/configs/sun50i.h | 1 - include/configs/sunxi-common.h | 24 ++--- scripts/config_whitelist.txt | 1 - 37 files changed, 458 insertions(+), 100 deletions(-) create mode 100644 arch/arm/dts/sun50i-h5-orangepi-pc2.dts create mode 100644 arch/arm/dts/sun8i-h3-nanopi-neo-air.dts create mode 100644 configs/nanopi_neo_air_defconfig create mode 100644 configs/orangepi_pc2_defconfig
Quoted 34 lines · Jagan Teki
Hi Tom,
Please pull this PR.
thanks!
JaganThe following changes since commit
b24cf8540a85a9bf97975aadd6a7542f166c78a3:video: mxsfb: Fix reset hang when videomode variable is not present (2017-02-22 21:47:59 +0100)
are available in the git repository at:
git://git.denx.de/u-boot-sunxi.gitmasterfor you to fetch changes up to
35affe7698e95c058a1f6c7eb2e1bf35f82461c9:sunxi: add NanoPi NEO Air defconfig (2017-02-25 13:54:15 +0530)
----------------------------------------------------------------
Andre Przywara (12):
sunxi: fix ACTLR.SMP assembly routine
ARM: renameCONFIG_TIMER_CLK_FREQtoCOUNTER_FREQUENCY
fsl: ls102x: remove redundantGENERIC_TIMER_CLK
sunxi: simplify ACTLR.SMP bit set #ifdef
sunxi: configs: merge sun9i and sun50i SPL memory definitions
sunxi:Kconfig: introduceCONFIG_SUNXI_HIGH_SRAM
sunxi: provide ARMv8mem_mapfor every ARM64 board
SPI: SPL: sunxi: fix 64-bit build
sunxi: DRAM: add Allwinner H5 support
sunxi: prepare for sharingMACH_SUN8I_H3config symbol
sunxi: introduce Allwinner H5 config option
sunxi: Add OrangePi PC 2 initial support
Quoted 2 lines
Jelle van der Waa (1):
sunxi: add NanoPi NEO Air defconfig
So today is -rc3 day. Which of the above are bug fixes, rather than new functionality? Thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20170227/6339f5e3/attachment.sig>
Hi Tom,
Quoted 35 lines · Tom Rini
Quoted 34 lines · Jagan Teki
Hi Tom,
Please pull this PR.
thanks!
JaganThe following changes since commit
b24cf8540a85a9bf97975aadd6a7542f166c78a3:video: mxsfb: Fix reset hang when videomode variable is not present (2017-02-22 21:47:59 +0100)
are available in the git repository at:
git://git.denx.de/u-boot-sunxi.gitmasterfor you to fetch changes up to
35affe7698e95c058a1f6c7eb2e1bf35f82461c9:sunxi: add NanoPi NEO Air defconfig (2017-02-25 13:54:15 +0530)
----------------------------------------------------------------
Andre Przywara (12):
sunxi: fix ACTLR.SMP assembly routine
ARM: renameCONFIG_TIMER_CLK_FREQtoCOUNTER_FREQUENCY
fsl: ls102x: remove redundantGENERIC_TIMER_CLK
sunxi: simplify ACTLR.SMP bit set #ifdef
sunxi: configs: merge sun9i and sun50i SPL memory definitions
sunxi:Kconfig: introduceCONFIG_SUNXI_HIGH_SRAM
sunxi: provide ARMv8mem_mapfor every ARM64 board
SPI: SPL: sunxi: fix 64-bit build
sunxi: DRAM: add Allwinner H5 support
sunxi: prepare for sharingMACH_SUN8I_H3config symbol
sunxi: introduce Allwinner H5 config option
sunxi: Add OrangePi PC 2 initial support
Quoted 5 lines
Quoted 2 lines
Jelle van der Waa (1):
sunxi: add NanoPi NEO Air defconfigSo today is -rc3 day. Which of the above are bug fixes, rather than new functionality? Thanks!
So technically only the first patch in my series is a bug fix, maybe the SPL SPI driver fix as well:
- sunxi: fix ACTLR.SMP assembly routine
- SPI: SPL: sunxi: fix 64-bit build
I think this was sent under the assumption that we stick with the rather loose merge policy from the past (pulling new things in even after -rc1). The patches have been on the list for a while, v3 was sent just two days after the merge window closed, etc.
But I take it that we are getting stricter with this, which is something I really welcome, because the loose policy led to scarily late merges and thus breakages in the past.
So from my point of view I am fine with postponing this for the next merge window, which is basically just around the corner anyway.
For Jelle's patch: I don't know if a new _defconfig (NanoPi NEO Air) really hurts or could be accepted at this point as well.
Cheers,
Andre.