diff options
author | Stefano Babic <sbabic@denx.de> | 2013-09-13 12:04:54 +0200 |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2013-09-13 12:10:07 +0200 |
commit | c4a7ece02046f647019cc0aaddf530833a8db29c (patch) | |
tree | 06342cd9b8cc41b95442a992fb38a1bc8671b05c /include/configs/exynos5250-dt.h | |
parent | b5e7f1bc4b899ea34e838d5d60b3e6f8e479d0a9 (diff) | |
parent | 8386ca8bea7a6a8469c3b6a99313afb642e6cbeb (diff) | |
download | u-boot-imx-c4a7ece02046f647019cc0aaddf530833a8db29c.zip u-boot-imx-c4a7ece02046f647019cc0aaddf530833a8db29c.tar.gz u-boot-imx-c4a7ece02046f647019cc0aaddf530833a8db29c.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-arm
Conflicts:
MAINTAINERS
boards.cfg
Signed-off-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'include/configs/exynos5250-dt.h')
-rw-r--r-- | include/configs/exynos5250-dt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h index 8f8f85f..8c21909 100644 --- a/include/configs/exynos5250-dt.h +++ b/include/configs/exynos5250-dt.h @@ -13,7 +13,7 @@ #define CONFIG_SAMSUNG /* in a SAMSUNG core */ #define CONFIG_S5P /* S5P Family */ #define CONFIG_EXYNOS5 /* which is in a Exynos5 Family */ -#define CONFIG_SMDK5250 /* which is in a SMDK5250 */ +#define CONFIG_EXYNOS5250 #include <asm/arch/cpu.h> /* get chip and board defs */ |