diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-19 12:53:59 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-06-19 12:53:59 +0200 |
| commit | 69f14dc2fd64307f012381dd333a06001dec75dc (patch) | |
| tree | 1c520dfb9afd8406230a5382ebaf57b0b8cd6c5d /lib | |
| parent | 847e6693ccb529bf8346db62876f38f0c4e04ade (diff) | |
| parent | ed7bdc03eb516fb698ccc12ec5b4b9f132d05c5f (diff) | |
| download | u-boot-imx-69f14dc2fd64307f012381dd333a06001dec75dc.zip u-boot-imx-69f14dc2fd64307f012381dd333a06001dec75dc.tar.gz u-boot-imx-69f14dc2fd64307f012381dd333a06001dec75dc.tar.bz2 | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Conflicts:
spl/Makefile
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fdtdec.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index ac1fe0b..e3142cb 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -62,6 +62,7 @@ static const char * const compat_names[COMPAT_COUNT] = { COMPAT(SAMSUNG_EXYNOS_TMU, "samsung,exynos-tmu"), COMPAT(SAMSUNG_EXYNOS_FIMD, "samsung,exynos-fimd"), COMPAT(SAMSUNG_EXYNOS5_DP, "samsung,exynos5-dp"), + COMPAT(SAMSUNG_EXYNOS5_DWMMC, "samsung,exynos5250-dwmmc"), COMPAT(MAXIM_MAX77686_PMIC, "maxim,max77686_pmic"), COMPAT(GENERIC_SPI_FLASH, "spi-flash"), COMPAT(MAXIM_98095_CODEC, "maxim,max98095-codec"), |