diff options
| author | Tom Rini <[email protected]> | 2022-02-03 23:20:20 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-02-03 23:24:31 -0500 |
| commit | 3aaabfe9ff4bbcd11096513b1b28d1fb0a40800f (patch) | |
| tree | cf8ffc29edb6bd06cd7ba02f1eb246798289539e /boot | |
| parent | 3e5f4b337d89e95af9d3700a4b055b552bf22ac4 (diff) | |
| parent | b6ffd58e45043b822844345d4ca9b2cb1e2917b7 (diff) | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-sunxi
This is the promised second part of the sunxi PR for 2022.04, albeit
technially outside of the merge window. We were working on this full
steam since the beginning of the year, and it deserves to be merged,
I think.
The main attraction is support for the F1C100s SoC, which sports a
venerable ARM926 core. Support for this SoC and the LicheePi Nano board
has been in Linux for years, and U-Boot patches were posted mid last
year already.
The new SoC using ARMv5 also means that the bulk of the new code should
not touch any existing boards, although we did some refactorings first,
of course, which actually cleans up some existing sunxi code.
Compile tested for all 160 sunxi boards, and briefly tested on BananaPi M1,
OrangePi Zero, Pine64 and Pine-H64. Tested by others on their boards,
including F1C100s and F1C200s devices.
Diffstat (limited to 'boot')
| -rw-r--r-- | boot/Kconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/boot/Kconfig b/boot/Kconfig index c8d5906cd30..b83a4e84000 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -362,9 +362,10 @@ config SYS_TEXT_BASE depends on HAVE_SYS_TEXT_BASE default 0x0 if POSITION_INDEPENDENT default 0x80800000 if ARCH_OMAP2PLUS || ARCH_K3 - default 0x4a000000 if ARCH_SUNXI && !MACH_SUN9I && !MACH_SUN8I_V3S - default 0x2a000000 if ARCH_SUNXI && MACH_SUN9I - default 0x42e00000 if ARCH_SUNXI && MACH_SUN8I_V3S + default 0x81700000 if MACH_SUNIV + default 0x2a000000 if MACH_SUN9I + default 0x42e00000 if MACH_SUN8I_V3S + default 0x4a000000 if ARCH_SUNXI hex "Text Base" help The address in memory that U-Boot will be running from, initially. |