Pull request: u-boot-sunxi/master for 2021.10 - 2nd part
Andre Przywara
andre.przywara at arm.com
Mon Oct 25 16:06:58 CEST 2021
Hi Tom,
please pull the second sunxi PR for the 2021.10 merge window.
I decided to merge most of Samuel's rework and some smaller patches that
pave the way for more DM transitions and for accommodating the RISC-V SoC
in the future. Merging them now gives us the opportunity to get some wider
testing, since those subtle changes tend to break things.
Compile-tested for all 159 sunxi boards, boot-tested on Pine64-LTS
and OrangePi Zero.
Summary:
- Add and enable watchdog driver
- Prepare for SYSRESET driven AXP poweroff
- Prepare for SoCs without MMC2
- Some fixes for extending SPL (SPL-DM for RISC-V)
- Some preparations for proper VBUS management
- Fix secure monitor move
Thanks,
Andre
================================================
The following changes since commit 355d1e24f6143c4839be3c015c191421c4e9449c:
Merge https://source.denx.de/u-boot/custodians/u-boot-spi (2021-10-23 10:49:28 -0400)
are available in the Git repository at:
https://source.denx.de/u-boot/custodians/u-boot-sunxi.git master
for you to fetch changes up to c846fe43f0561311eb7261b34023a04646cdbd0d:
mmc: sunxi: conditionally include MMC2 initialization code (2021-10-25 14:54:57 +0100)
----------------------------------------------------------------
Andre Przywara (1):
sunxi: SPL SPI: Allow larger SPL
Icenowy Zheng (2):
sunxi: only include alias for eMMC when mmc2 used
mmc: sunxi: conditionally include MMC2 initialization code
Samuel Holland (14):
sunxi: Select SPL_SEPARATE_BSS
phy: sun4i-usb: Remove a couple of debug messages
phy: sun4i-usb: Refactor VBUS detection to match Linux
phy: sun4i-usb: Support VBUS detection via power supply
sunxi: A23/A33/H3: Actually move the secure monitor
tools: mksunxiboot: Use sunxi_image header directly
include: axp_pmic: Add missing header guard definition
include: axp_pmic: Include headers for all variants
power: axp: Avoid do_poweroff conflict with sysreset
power: pmic: axp: Implement poweroff via sysreset
clk: sunxi: Extend DM_RESET selection to SPL
watchdog: Add a driver for the sunxi watchdog
sunxi: Enable watchdog timer support by default
sunxi: dts: H616: Enable the watchdog
arch/arm/Kconfig | 2 +
arch/arm/dts/sun50i-h616.dtsi | 1 -
arch/arm/dts/sunxi-u-boot.dtsi | 2 +
arch/arm/mach-sunxi/spl_spi_sunxi.c | 10 +-
drivers/clk/sunxi/Kconfig | 1 +
drivers/mmc/sunxi_mmc.c | 2 +
drivers/phy/allwinner/Kconfig | 1 +
drivers/phy/allwinner/phy-sun4i-usb.c | 34 +++---
drivers/power/axp152.c | 2 +
drivers/power/axp209.c | 2 +
drivers/power/axp221.c | 2 +
drivers/power/axp305.c | 2 +-
drivers/power/axp809.c | 2 +
drivers/power/axp818.c | 2 +
drivers/power/pmic/Kconfig | 2 +
drivers/power/pmic/axp.c | 49 ++++++++-
drivers/watchdog/Kconfig | 8 ++
drivers/watchdog/Makefile | 1 +
drivers/watchdog/sunxi_wdt.c | 188 ++++++++++++++++++++++++++++++++++
include/axp152.h | 2 +
include/axp209.h | 2 +
include/axp221.h | 2 +
include/axp809.h | 2 +
include/axp818.h | 2 +
include/axp_pmic.h | 13 +--
include/configs/sun8i.h | 2 +
tools/mksunxiboot.c | 2 +-
27 files changed, 305 insertions(+), 35 deletions(-)
create mode 100644 drivers/watchdog/sunxi_wdt.c
More information about the U-Boot
mailing list