diff options
| author | Tom Rini <trini@konsulko.com> | 2024-07-12 13:07:54 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-07-12 14:00:45 -0600 |
| commit | 246a0ce1e17358c4a08579dfca9b33c179a3a928 (patch) | |
| tree | 437d584edf097dfc4eb9327f2943c6e0d13f93dc /common | |
| parent | 1ca216522d41caa250c19dcb96d1f4c165556d90 (diff) | |
| parent | f41582035cf771594d11d2e0d624ed82ed11eedf (diff) | |
| download | u-boot-246a0ce1e17358c4a08579dfca9b33c179a3a928.tar.gz u-boot-246a0ce1e17358c4a08579dfca9b33c179a3a928.tar.bz2 u-boot-246a0ce1e17358c4a08579dfca9b33c179a3a928.zip | |
Merge patch series "Add Turris 1.x board"
Marek Mojík <marek.mojik@nic.cz> says:
Hello all,
this is a continuation of previous work by Pali to add support for the
Turris 1.x board. As the patches were based on u-boot v2022.04, a
nontrivial rebasing was needed.
Some notes:
- Some options that are in SD defconfig are disabled in NOR defconfig
because over the years u-boot grew and the old NOR defconfig will not
fit into NOR memory.
- SD boot with RAM larger than 2GB will only allocate 2GB of RAM (We
were not able to fix this yet)
Diffstat (limited to 'common')
| -rw-r--r-- | common/board_f.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/common/board_f.c b/common/board_f.c index 212ffb3090..22c180b218 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -949,7 +949,7 @@ static const init_fnc_t init_sequence_f[] = { * - board info struct */ setup_dest_addr, -#ifdef CONFIG_OF_BOARD_FIXUP +#if defined(CONFIG_OF_BOARD_FIXUP) && !defined(CONFIG_OF_INITIAL_DTB_READONLY) fix_fdt, #endif #ifdef CFG_PRAM @@ -965,6 +965,10 @@ static const init_fnc_t init_sequence_f[] = { reserve_board, reserve_global_data, reserve_fdt, +#if defined(CONFIG_OF_BOARD_FIXUP) && defined(CONFIG_OF_INITIAL_DTB_READONLY) + reloc_fdt, + fix_fdt, +#endif reserve_bootstage, reserve_bloblist, reserve_arch, @@ -975,7 +979,9 @@ static const init_fnc_t init_sequence_f[] = { setup_bdinfo, display_new_sp, INIT_FUNC_WATCHDOG_RESET +#if !defined(CONFIG_OF_BOARD_FIXUP) || !defined(CONFIG_OF_INITIAL_DTB_READONLY) reloc_fdt, +#endif reloc_bootstage, reloc_bloblist, setup_reloc, |