diff options
| author | Tom Rini <[email protected]> | 2024-07-16 10:20:14 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-07-16 10:20:14 -0600 |
| commit | a0a7a649a1b56db14aff6e4e7509662b663af42d (patch) | |
| tree | d20c71fd92e41ef219a96dde70cc98fe6f6a9a9f /board/sunxi | |
| parent | af3c2166d54cdb71914baece900095bad5a44862 (diff) | |
| parent | 674e4f994f5da537cab62ad86bc8bdf5acaae88c (diff) | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi
Nothing really major here, some rework of the SPL PMIC drivers, adding
support for the AXP717 on the way, which is showing up on newer boards
now, most prominently some Anbernic handheld gaming devices. The rest
is enabling Ethernet and SPI boot on the Allwinner V3s SoC, plus two
fixes. This also updates the "traditional U-Boot" DTs to that of kernel
v6.9. I will look into upgrading some SoCs to dts/upstream in the
coming cycle, though this will not cover all SoCs for now, as we carry
some non-mainline fix to improve compatibility with older kernels. Will
see how it goes, but for now we stick with the "old way".
The branch survived the gitlab CI run, and Linux boot testing on some
selected boards.
Diffstat (limited to 'board/sunxi')
| -rw-r--r-- | board/sunxi/board.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/board/sunxi/board.c b/board/sunxi/board.c index b9d47f5e870..961cdcde74d 100644 --- a/board/sunxi/board.c +++ b/board/sunxi/board.c @@ -562,7 +562,7 @@ void sunxi_board_init(void) #if defined CONFIG_AXP152_POWER || defined CONFIG_AXP209_POWER || \ defined CONFIG_AXP221_POWER || defined CONFIG_AXP305_POWER || \ defined CONFIG_AXP809_POWER || defined CONFIG_AXP818_POWER || \ - defined CONFIG_AXP313_POWER + defined CONFIG_AXP313_POWER || defined CONFIG_AXP717_POWER power_failed = axp_init(); if (IS_ENABLED(CONFIG_AXP_DISABLE_BOOT_ON_POWERON) && !power_failed) { |