diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-03-25 10:25:14 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-03-25 10:53:15 +0100 |
| commit | ab6423cae0323e8db2c8fdd0a99138d93fde2137 (patch) | |
| tree | a97493753a119e577161a4fb0b40b8edfc3923bb /arch/arm/include | |
| parent | 63f347ec4ca94e3b57c6c719e4acaec81b61dc7a (diff) | |
| parent | 2c072c958bb544c72f0e848375803dbd6971f022 (diff) | |
| download | u-boot-imx-ab6423cae0323e8db2c8fdd0a99138d93fde2137.zip u-boot-imx-ab6423cae0323e8db2c8fdd0a99138d93fde2137.tar.gz u-boot-imx-ab6423cae0323e8db2c8fdd0a99138d93fde2137.tar.bz2 | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Trivial merge conflict, needed to manually remove
local_info as per commit 41364f0f.
Conflicts:
board/samsung/common/board.c
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/arch-kirkwood/config.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch-kirkwood/config.h b/arch/arm/include/asm/arch-kirkwood/config.h index 197703b..7a688e4 100644 --- a/arch/arm/include/asm/arch-kirkwood/config.h +++ b/arch/arm/include/asm/arch-kirkwood/config.h @@ -38,7 +38,7 @@ * CONFIG_SYS_KWD_CONFIG should be defined in board specific header file */ #ifndef CONFIG_SYS_KWD_CONFIG -#define CONFIG_SYS_KWD_CONFIG $(SRCTREE)/$(CONFIG_BOARDDIR)/kwbimage.cfg +#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage.cfg #endif /* CONFIG_SYS_KWD_CONFIG */ /* Kirkwood has 2k of Security SRAM, use it for SP */ |