diff options
| author | Tom Rini <[email protected]> | 2024-07-12 13:07:54 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-07-12 14:00:45 -0600 |
| commit | 246a0ce1e17358c4a08579dfca9b33c179a3a928 (patch) | |
| tree | 437d584edf097dfc4eb9327f2943c6e0d13f93dc /boot | |
| parent | 1ca216522d41caa250c19dcb96d1f4c165556d90 (diff) | |
| parent | f41582035cf771594d11d2e0d624ed82ed11eedf (diff) | |
Merge patch series "Add Turris 1.x board"
Marek Mojík <[email protected]> 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 'boot')
| -rw-r--r-- | boot/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/boot/Kconfig b/boot/Kconfig index ffcae840a50..95300b008c5 100644 --- a/boot/Kconfig +++ b/boot/Kconfig @@ -816,7 +816,7 @@ choice prompt "Freescale PBL (or predecessor) load location" depends on RAMBOOT_PBL || ((TARGET_P1010RDB_PA || TARGET_P1010RDB_PB \ || TARGET_P1020RDB_PC || TARGET_P1020RDB_PD || TARGET_P2020RDB) \ - && !CMD_NAND) + && !CMD_NAND) || (TARGET_TURRIS_1X && SYS_MPC85XX_NO_RESETVEC) config SDCARD bool "Freescale PBL (or similar) is found on SD card" |