summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2023-12-08 22:00:01 -0500
committerTom Rini <[email protected]>2023-12-08 22:00:01 -0500
commite9742cb67ffb174759c0536860fedf4c6a3dff82 (patch)
tree330f0cab3e186c81e6fc45e21ef6afd06f0d66c0 /common
parentdd638467a4c9131e6732ce489d335b0309d8f13d (diff)
parentd2e1cc69a24719e9939a84dc42bdf281af6ec35d (diff)
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi
The first four patches are actual fixes. The last three patches add support for the apparently popular OrangePi Zero 3 board: multiple people seem to be champing at the bit, so I'd rather give them something real instead of people using random trees they found on the Internet. It's actually mostly the new defconfig file anyway, so the chances for regressions are very slim.
Diffstat (limited to 'common')
-rw-r--r--common/spl/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 25cd18afda7..c521b02f4a3 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -370,7 +370,7 @@ config SPL_STACK
default 0x93ffb8 if ARCH_MX6 && MX6_OCRAM_256KB
default 0x91ffb8 if ARCH_MX6 && !MX6_OCRAM_256KB
default 0x118000 if MACH_SUN50I_H6
- default 0x58000 if MACH_SUN50I_H616
+ default 0x52a00 if MACH_SUN50I_H616
default 0x40000 if MACH_SUN8I_R528
default 0x54000 if MACH_SUN50I || MACH_SUN50I_H5
default 0x18000 if MACH_SUN9I