summaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorTom Rini <[email protected]>2021-02-01 08:15:46 -0500
committerTom Rini <[email protected]>2021-02-01 08:15:46 -0500
commit7ee6205a5f286937cbd47f9ffbc27fd510be9223 (patch)
tree608f320cbdf0b9fbbf8de40cb0b05b7e4f5bf02a /common
parentd039975f077f39a3129e1aa1f7236d67e4b06e7b (diff)
parent77f898d04095cdccb69c476ba0aa19f257fca64d (diff)
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- Fix CMD_ACPI dependency in Kconfig - Correct overflow in __udelay() in TSC timer driver - Add a devicetree node for eMMC for Coral - Minor improvements on image loading - Reduce size of Samus image
Diffstat (limited to 'common')
-rw-r--r--common/spl/spl.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/common/spl/spl.c b/common/spl/spl.c
index 8cb6f3d531f..cdd7b05f279 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -144,6 +144,12 @@ ulong spl_get_image_size(void)
binman_sym(ulong, u_boot_any, size);
}
+ulong spl_get_image_text_base(void)
+{
+ return spl_phase() == PHASE_TPL ? CONFIG_SPL_TEXT_BASE :
+ CONFIG_SYS_TEXT_BASE;
+}
+
/*
* Weak default function for board specific cleanup/preparation before
* Linux boot. Some boards/platforms might not need it, so just provide