aboutsummaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2022-10-20 08:58:05 -0400
committerTom Rini <trini@konsulko.com>2022-10-20 08:58:05 -0400
commit73ceadcd7280cb552119e24ca092d626b12626a6 (patch)
treea09bb39ca939c756772ccce0bba2caaa142dad7d /boot
parent3724ddf157aab3bd009c1da234b9a1af1621b544 (diff)
parent843ed983a07ee5d8d4e4ac5baa39fc53f12b5f33 (diff)
downloadu-boot-73ceadcd7280cb552119e24ca092d626b12626a6.zip
u-boot-73ceadcd7280cb552119e24ca092d626b12626a6.tar.gz
u-boot-73ceadcd7280cb552119e24ca092d626b12626a6.tar.bz2
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi
Beside some rather unexciting sync of the DTs from the kernel tree, and some Kconfig cleanup, there are some improvements for the ARMv5 Allwinner family, to support boards with the F1C200s (64MB DRAM) better. We will get actual board support as soon as the DTs have passed the Linux review process. There is also support for the X96 Mate TV Box, featuring the H616 SoC and a full 4GB of DRAM. Also we found the secret to enable SPI booting on the H616 (pin PC5 must be pulled to GND), so the SPI boot support patch is now good to go. Passed the gitlab CI, plus briefly tested on Pine64-LTS, LicheePi Nano, X96 Mate and OrangePi Zero.
Diffstat (limited to 'boot')
-rw-r--r--boot/Kconfig4
1 files changed, 2 insertions, 2 deletions
diff --git a/boot/Kconfig b/boot/Kconfig
index 6b3b8f0..45f86e9 100644
--- a/boot/Kconfig
+++ b/boot/Kconfig
@@ -499,8 +499,8 @@ config SYS_TEXT_BASE
default 0x80800000 if ARCH_OMAP2PLUS || ARCH_K3
default 0x81700000 if MACH_SUNIV
default 0x2a000000 if MACH_SUN9I
- default 0x42e00000 if MACH_SUN8I_V3S
- default 0x4a000000 if ARCH_SUNXI
+ default 0x4a000000 if SUNXI_MINIMUM_DRAM_MB >= 256
+ default 0x42e00000 if SUNXI_MINIMUM_DRAM_MB >= 64
hex "Text Base"
help
The address in memory that U-Boot will be running from, initially.