summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2019-07-16 11:19:31 -0400
committerTom Rini <[email protected]>2019-07-16 11:19:31 -0400
commit0e80dda32c8d724c2a98dbbfb2f1e59762788f15 (patch)
treea569b9b170c85a3bcae895c21c72def941ca9af9 /common
parent9c94e0a64490b90d48995a8230499167c0bdca68 (diff)
parentf96238e253661b43168352010a2628957940bd4b (diff)
Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-sunxi
- Beelink-x2 STB support (Marcus) - H6 DDR3, LPDDR3 changes (Andre, Jernej) - H6 pin controller, USB PHY (Andre)
Diffstat (limited to 'common')
-rw-r--r--common/spl/Kconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 126931baceb..7122c069b2d 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -116,6 +116,9 @@ config SPL_LDSCRIPT
config SPL_TEXT_BASE
hex "SPL Text Base"
default ISW_ENTRY_ADDR if AM43XX || AM33XX || OMAP54XX || ARCH_KEYSTONE
+ default 0x10060 if MACH_SUN50I || MACH_SUN50I_H5 || MACH_SUN9I
+ default 0x20060 if MACH_SUN50I_H6
+ default 0x00060 if ARCH_SUNXI
default 0x0
help
The address in memory that SPL will be running from.