summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2020-01-26 12:05:11 -0500
committerTom Rini <trini@konsulko.com>2020-01-26 12:05:11 -0500
commit0b23b0d9f969c4a587cb9ee75905d6f6f9d1d2ea (patch)
treeaf37dbf79ad534f70291e5e3e8046227533da156 /common
parent40521a6c90d4adfb7f3041033c8cbbeff087a5ca (diff)
parent2936eb2d550a642275113464fc9dcbb03357c049 (diff)
downloadu-boot-0b23b0d9f969c4a587cb9ee75905d6f6f9d1d2ea.tar.gz
Merge branch 'master' of https://gitlab.denx.de/u-boot/custodians/u-boot-sunxiWIP/26Jan2020
- Libre Computer ALL-H3-IT/ALL-H5-CC board (Chen-Yu Tsai) - Allwinner R40 Ethernet, usb phy enablement (Andre Przywara) - Sunxi auto load from 128KB MMC offset (Andre Przywara) - Orange Pi Win Ethernet phy enablement (Jernej Skrabec)
Diffstat (limited to 'common')
-rw-r--r--common/spl/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 76f39dc04f..b03a476b9f 100644
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -1100,6 +1100,7 @@ endif # SPL_SPI_FLASH_SUPPORT
config SYS_SPI_U_BOOT_OFFS
hex "address of u-boot payload in SPI flash"
+ default 0x8000 if ARCH_SUNXI
default 0x0
depends on SPL_SPI_LOAD || SPL_SPI_SUNXI
help