diff options
| author | Tom Rini <trini@konsulko.com> | 2022-11-21 11:54:58 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-11-21 11:54:58 -0500 |
| commit | 347ed8482217c86a011d6269bcd3e75fbecc2834 (patch) | |
| tree | 1fe2bbd3b83d93636a95973f7948e5a6ab9bef55 /arch/arm | |
| parent | bebb393b340295edb9ba50a996fc0510cd1b6ac0 (diff) | |
| parent | 4b0a1f59873abca079a4462a9a90d76abbcbc419 (diff) | |
Merge branch '2022-11-21-important-fixes'
- Several important fixes for the Nokia RX51 platform, and a few other
fixes while we're at it.
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/lib/crt0.S | 5 | ||||
| -rw-r--r-- | arch/arm/mach-imx/imx8/Kconfig | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi b/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi index 8fd0e33d2b6..956d7249798 100644 --- a/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi +++ b/arch/arm/dts/fsl-imx8qm-apalis-u-boot.dtsi @@ -3,8 +3,6 @@ * Copyright 2019 Toradex AG */ -#include "imx8qm-u-boot.dtsi" - &mu { u-boot,dm-pre-proper; }; diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S index 6d566dca5c8..a0311438b45 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -147,6 +147,11 @@ ENTRY(_main) ldr r1, =CONFIG_TEXT_BASE sub r1, r0 add lr, r1 +#if defined(CONFIG_SYS_RELOC_GD_ENV_ADDR) + ldr r0, [r9, #GD_ENV_ADDR] /* r0 = gd->env_addr */ + add r0, r0, r1 + str r0, [r9, #GD_ENV_ADDR] +#endif #endif ldr r0, [r9, #GD_RELOC_OFF] /* r0 = gd->reloc_off */ add lr, lr, r0 diff --git a/arch/arm/mach-imx/imx8/Kconfig b/arch/arm/mach-imx/imx8/Kconfig index 91bd888308f..37d12d18958 100644 --- a/arch/arm/mach-imx/imx8/Kconfig +++ b/arch/arm/mach-imx/imx8/Kconfig @@ -46,7 +46,6 @@ choice config TARGET_APALIS_IMX8 bool "Support Apalis iMX8 module" - select BINMAN select BOARD_LATE_INIT select IMX8QM |