diff options
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/lib/crt0.S | 2 | ||||
| -rw-r--r-- | arch/arm/lib/crt0_64.S | 2 | ||||
| -rw-r--r-- | arch/arm/mach-rockchip/Kconfig | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 79f60eb3f34..6194de36074 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1067,7 +1067,7 @@ config ARCH_OWL select CLK select CLK_OWL select OF_CONTROL - select SYS_RELOC_GD_ENV_ADDR + select ENV_RELOC_GD_ENV_ADDR imply CMD_DM config ARCH_QEMU @@ -1206,7 +1206,7 @@ config ARCH_SUNXI select USB_STORAGE if DISTRO_DEFAULTS && USB_HOST select SPL_USE_TINY_PRINTF if SPL select USE_PREBOOT - select SYS_RELOC_GD_ENV_ADDR + select ENV_RELOC_GD_ENV_ADDR imply BOARD_LATE_INIT imply CMD_DM imply CMD_GPT diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S index a50dde60e8b..3e11fadafc6 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -145,7 +145,7 @@ ENTRY(_main) ldr r1, =CONFIG_TEXT_BASE sub r1, r0 add lr, r1 -#if defined(CONFIG_SYS_RELOC_GD_ENV_ADDR) +#if defined(CONFIG_ENV_RELOC_GD_ENV_ADDR) ldr r0, [r9, #GD_ENV_ADDR] /* r0 = gd->env_addr */ add r0, r0, r1 str r0, [r9, #GD_ENV_ADDR] diff --git a/arch/arm/lib/crt0_64.S b/arch/arm/lib/crt0_64.S index 30950ddaf9b..f3f279f2c39 100644 --- a/arch/arm/lib/crt0_64.S +++ b/arch/arm/lib/crt0_64.S @@ -119,7 +119,7 @@ ENTRY(_main) ldr x9, _TEXT_BASE /* x9 <- Linked value of _start */ sub x9, x9, x0 /* x9 <- Run-vs-link offset */ add lr, lr, x9 -#if defined(CONFIG_SYS_RELOC_GD_ENV_ADDR) +#if defined(CONFIG_ENV_RELOC_GD_ENV_ADDR) ldr x0, [x18, #GD_ENV_ADDR] /* x0 <- gd->env_addr */ add x0, x0, x9 str x0, [x18, #GD_ENV_ADDR] diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig index 9210877a4a4..2c5f9770958 100644 --- a/arch/arm/mach-rockchip/Kconfig +++ b/arch/arm/mach-rockchip/Kconfig @@ -363,7 +363,7 @@ config ROCKCHIP_RK3528 imply SPL_REGMAP imply SPL_SERIAL imply SPL_SYSCON - imply SYS_RELOC_GD_ENV_ADDR + imply ENV_RELOC_GD_ENV_ADDR imply SYSRESET imply SYSRESET_PSCI if SPL_ATF help @@ -447,7 +447,7 @@ config ROCKCHIP_RK3576 imply SPL_REGMAP imply SPL_SERIAL imply SPL_SYSCON - imply SYS_RELOC_GD_ENV_ADDR + imply ENV_RELOC_GD_ENV_ADDR imply SYSRESET help The Rockchip RK3576 is a ARM-based SoC with quad-core Cortex-A72 and |