diff options
author | Tom Rini <trini@konsulko.com> | 2019-07-11 18:08:44 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-07-11 18:08:44 -0400 |
commit | 79b8d3c285f4f1c2ee4b27367f2ca3ecb76ed9ce (patch) | |
tree | 20571bc51871460b41b53c906881541e4ee2ce5c /arch/arm/cpu | |
parent | 5acce685c9227b3d4b48f6fab6a33f6d74ca9c14 (diff) | |
parent | 2ce6b82d340cf1b1e5a43f1b5c8965d0067d5246 (diff) | |
download | u-boot-79b8d3c285f4f1c2ee4b27367f2ca3ecb76ed9ce.zip u-boot-79b8d3c285f4f1c2ee4b27367f2ca3ecb76ed9ce.tar.gz u-boot-79b8d3c285f4f1c2ee4b27367f2ca3ecb76ed9ce.tar.bz2 |
Merge tag 'uniphier-v2019.10' of https://gitlab.denx.de/u-boot/custodians/u-boot-uniphier
UniPhier SoC updates for v2019.10
- import DT updates from Linux
- add UniPhier SPI controller driver
- make U-Boot image for 64bit SoCs position independent
- tidy up various init code for next generation SoCs
- misc cleanups
Diffstat (limited to 'arch/arm/cpu')
-rw-r--r-- | arch/arm/cpu/armv8/linux-kernel-image-header-vars.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv8/linux-kernel-image-header-vars.h b/arch/arm/cpu/armv8/linux-kernel-image-header-vars.h index fa6e86d..b4220e4 100644 --- a/arch/arm/cpu/armv8/linux-kernel-image-header-vars.h +++ b/arch/arm/cpu/armv8/linux-kernel-image-header-vars.h @@ -48,7 +48,7 @@ #define __MAX(a, b) (((a) > (b)) ? (a) : (b)) #define __CODE_DATA_SIZE (__bss_start - _start) #define __BSS_SIZE (__bss_end - __bss_start) -#ifdef CONFIG_SYS_INIT_SP_BSS_OFFSET +#ifdef CONFIG_INIT_SP_RELATIVE #define __MAX_EXTRA_RAM_USAGE __MAX(__BSS_SIZE, CONFIG_SYS_INIT_SP_BSS_OFFSET) #else #define __MAX_EXTRA_RAM_USAGE __BSS_SIZE |