diff options
| author | Simon Glass <sjg@chromium.org> | 2022-10-20 18:22:39 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-10-31 11:01:31 -0400 |
| commit | 984639039f4cfe32ec2cc531d6ace05326ac49eb (patch) | |
| tree | 472bf7e47978335a73c5d6025d3b83b534f7192b /common/autoboot.c | |
| parent | 6f38d91158e7e4199753b79e0a25c1a65175aba4 (diff) | |
| download | u-boot-984639039f4cfe32ec2cc531d6ace05326ac49eb.zip u-boot-984639039f4cfe32ec2cc531d6ace05326ac49eb.tar.gz u-boot-984639039f4cfe32ec2cc531d6ace05326ac49eb.tar.bz2 | |
Rename CONFIG_SYS_TEXT_BASE to CONFIG_TEXT_BASE
The current name is inconsistent with SPL which uses CONFIG_SPL_TEXT_BASE
and this makes it imposible to use CONFIG_VAL().
Rename it to resolve this problem.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'common/autoboot.c')
| -rw-r--r-- | common/autoboot.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/autoboot.c b/common/autoboot.c index cdafe76..ea44fdf 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -424,19 +424,19 @@ static int abortboot(int bootdelay) static void process_fdt_options(const void *blob) { -#ifdef CONFIG_SYS_TEXT_BASE +#ifdef CONFIG_TEXT_BASE ulong addr; /* Add an env variable to point to a kernel payload, if available */ addr = ofnode_conf_read_int("kernel-offset", 0); if (addr) - env_set_addr("kernaddr", (void *)(CONFIG_SYS_TEXT_BASE + addr)); + env_set_addr("kernaddr", (void *)(CONFIG_TEXT_BASE + addr)); /* Add an env variable to point to a root disk, if available */ addr = ofnode_conf_read_int("rootdisk-offset", 0); if (addr) - env_set_addr("rootaddr", (void *)(CONFIG_SYS_TEXT_BASE + addr)); -#endif /* CONFIG_SYS_TEXT_BASE */ + env_set_addr("rootaddr", (void *)(CONFIG_TEXT_BASE + addr)); +#endif /* CONFIG_TEXT_BASE */ } const char *bootdelay_process(void) |