| Message ID | 1402516908-18821-1-git-send-email-jeroen@myspectrum.nl |
|---|---|
| State | Accepted |
| Delegated to: | Albert ARIBAUD |
| Headers | show |
Hi Jeroen, On Wed, 11 Jun 2014 22:01:48 +0200, Jeroen Hofstee <jeroen@myspectrum.nl> wrote: > cc: Tom Rini <trini@ti.com> > Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> > --- > arch/arm/include/asm/arch-keystone/spl.h | 2 +- > arch/arm/include/asm/arch-sunxi/spl.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/include/asm/arch-keystone/spl.h b/arch/arm/include/asm/arch-keystone/spl.h > index 7012ea7..a7102d5 100644 > --- a/arch/arm/include/asm/arch-keystone/spl.h > +++ b/arch/arm/include/asm/arch-keystone/spl.h > @@ -5,7 +5,7 @@ > * SPDX-License-Identifier: GPL-2.0+ > */ > #ifndef _ASM_ARCH_SPL_H_ > -#define _ASM_SPL_H_ > +#define _ASM_ARCH_SPL_H_ > > #define BOOT_DEVICE_SPI 2 > > diff --git a/arch/arm/include/asm/arch-sunxi/spl.h b/arch/arm/include/asm/arch-sunxi/spl.h > index ff871bc..acbec46 100644 > --- a/arch/arm/include/asm/arch-sunxi/spl.h > +++ b/arch/arm/include/asm/arch-sunxi/spl.h > @@ -7,7 +7,7 @@ > * SPDX-License-Identifier: GPL-2.0+ > */ > #ifndef _ASM_ARCH_SPL_H_ > -#define _ASM_SPL_H_ > +#define _ASM_ARCH_SPL_H_ > > #define BOOT_DEVICE_NONE 0 > #define BOOT_DEVICE_XIP 1 Considered a fix for potential bugs/compiler errors, and applied as such to u-boot-arm/master, thanks. (Tom, this means another ARM PR today, with this fix and a couple of switches to generic board and a harmless code-move patch for socfpga.) Amicalement,
diff --git a/arch/arm/include/asm/arch-keystone/spl.h b/arch/arm/include/asm/arch-keystone/spl.h index 7012ea7..a7102d5 100644 --- a/arch/arm/include/asm/arch-keystone/spl.h +++ b/arch/arm/include/asm/arch-keystone/spl.h @@ -5,7 +5,7 @@ * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_ARCH_SPL_H_ -#define _ASM_SPL_H_ +#define _ASM_ARCH_SPL_H_ #define BOOT_DEVICE_SPI 2 diff --git a/arch/arm/include/asm/arch-sunxi/spl.h b/arch/arm/include/asm/arch-sunxi/spl.h index ff871bc..acbec46 100644 --- a/arch/arm/include/asm/arch-sunxi/spl.h +++ b/arch/arm/include/asm/arch-sunxi/spl.h @@ -7,7 +7,7 @@ * SPDX-License-Identifier: GPL-2.0+ */ #ifndef _ASM_ARCH_SPL_H_ -#define _ASM_SPL_H_ +#define _ASM_ARCH_SPL_H_ #define BOOT_DEVICE_NONE 0 #define BOOT_DEVICE_XIP 1
cc: Tom Rini <trini@ti.com> Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl> --- arch/arm/include/asm/arch-keystone/spl.h | 2 +- arch/arm/include/asm/arch-sunxi/spl.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)