diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-11 09:59:27 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-11 09:59:27 +0200 |
| commit | 5480ac32171ab0e38c48c9f585fa650c7867f6a1 (patch) | |
| tree | 6672a47e3675e7e79fd0fbf9b491045230b24eed /include/configs/exynos5250-dt.h | |
| parent | 68e1747f9c0506159e8ecc9a4feb58e9c65a7b39 (diff) | |
| parent | 5c18a1cf3e56e0177388258696be4a17a672e9d0 (diff) | |
| download | talos-obmc-uboot-5480ac32171ab0e38c48c9f585fa650c7867f6a1.tar.gz talos-obmc-uboot-5480ac32171ab0e38c48c9f585fa650c7867f6a1.zip | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Conflicts:
tools/Makefile
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 8f8f85f440..8c21909d63 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 */ |
