diff options
author | Tom Rini <trini@konsulko.com> | 2019-06-20 21:52:31 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2019-06-20 21:52:31 -0400 |
commit | 226a35ef0ef310d8fffa3e6283ee3aab9dab26aa (patch) | |
tree | 22fe10155b4a590a165edaee8f5eb2b9b777b2fd /arch | |
parent | f643fb9f4c8fc5c5dceb8c2c2893447d18413d77 (diff) | |
parent | 2bc1821e8662f9ed67cc6eeb680148bb5c148379 (diff) | |
download | u-boot-226a35ef0ef310d8fffa3e6283ee3aab9dab26aa.zip u-boot-226a35ef0ef310d8fffa3e6283ee3aab9dab26aa.tar.gz u-boot-226a35ef0ef310d8fffa3e6283ee3aab9dab26aa.tar.bz2 |
Merge branch '2019-06-20-master-imports'
- Assorted minor fixes
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/cpu/armv8/start.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv8/start.S b/arch/arm/cpu/armv8/start.S index fe52166..99d1266 100644 --- a/arch/arm/cpu/armv8/start.S +++ b/arch/arm/cpu/armv8/start.S @@ -18,7 +18,7 @@ .globl _start _start: -#if defined(LINUX_KERNEL_IMAGE_HEADER) +#if defined(CONFIG_LINUX_KERNEL_IMAGE_HEADER) #include <asm/boot0-linux-kernel-header.h> #elif defined(CONFIG_ENABLE_ARM_SOC_BOOT0_HOOK) /* |