diff options
| author | Tom Rini <[email protected]> | 2020-04-17 11:08:08 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-04-17 11:17:29 -0400 |
| commit | 8d5d3bcf3c53d798bd7f3fe7092e994593bcc41c (patch) | |
| tree | dd145ccf787512306926b0e5f327046ccfbee33c /arch/arm | |
| parent | 0f238dab6d17caabe4f9781d23aaa6087139f2bd (diff) | |
| parent | 65c141ebbd68b70d6934b4fb965f3219d0e99817 (diff) | |
Merge branch '2020-04-16-master-imports'
- DM GPIO improvements
- BTRFS fixes
- Corrections around gd->new_bootstage alignment
- Start documentation improvements to support 'make refcheckdocs'
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/lib/crt0.S | 3 | ||||
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/mach-stm32mp/Kconfig | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/arch/arm/lib/crt0.S b/arch/arm/lib/crt0.S index fb6c37cf519..df9dd83e409 100644 --- a/arch/arm/lib/crt0.S +++ b/arch/arm/lib/crt0.S @@ -127,8 +127,7 @@ ENTRY(_main) ldr r0, [r9, #GD_START_ADDR_SP] /* sp = gd->start_addr_sp */ bic r0, r0, #7 /* 8-byte alignment for ABI compliance */ mov sp, r0 - ldr r9, [r9, #GD_BD] /* r9 = gd->bd */ - sub r9, r9, #GD_SIZE /* new GD is below bd */ + ldr r9, [r9, #GD_NEW_GD] /* r9 <- gd->new_gd */ adr lr, here ldr r0, [r9, #GD_RELOC_OFF] /* r0 = gd->reloc_off */ diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index aa140c4798c..329149900a5 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -41,7 +41,7 @@ config IMX_HAB imply CMD_DEKBLOB help This option enables the support for secure boot (HAB). - See doc/README.mxc_hab for more details. + See doc/imx/habv4/* for more details. config CSF_SIZE hex "Maximum size for Command Sequence File (CSF) binary" @@ -69,7 +69,7 @@ config CMD_DEKBLOB help This enables the 'dek_blob' command which is used with the Freescale secure boot mechanism. This command encapsulates and - creates a blob of data. See also CMD_BLOB and doc/README.mxc_hab for + creates a blob of data. See also CMD_BLOB and doc/imx/habv4/* for more information. config CMD_HDMIDETECT diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig index 7b86ce1612f..ba965e7b3b3 100644 --- a/arch/arm/mach-stm32mp/Kconfig +++ b/arch/arm/mach-stm32mp/Kconfig @@ -63,7 +63,9 @@ config TARGET_ST_STM32MP15x bool "STMicroelectronics STM32MP15x boards" select STM32MP15x imply BOOTCOUNT_LIMIT + imply BOOTSTAGE imply CMD_BOOTCOUNT + imply CMD_BOOTSTAGE imply CMD_CLS if CMD_BMP imply DISABLE_CONSOLE imply PRE_CONSOLE_BUFFER |