diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-09-09 00:21:24 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-09-09 00:21:24 +0200 |
| commit | b653516769160a7ba5bb4318c014535e063fdc0b (patch) | |
| tree | c690067308fbb118a069b84276f19880f7f83b47 /lib/fdtdec.c | |
| parent | 681f785f7cc616a70aaa0c93a25300b0820f6968 (diff) | |
| parent | 5cecf21fb1fadeb39be862793f743841ad373601 (diff) | |
| download | blackbird-obmc-uboot-b653516769160a7ba5bb4318c014535e063fdc0b.tar.gz blackbird-obmc-uboot-b653516769160a7ba5bb4318c014535e063fdc0b.zip | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Diffstat (limited to 'lib/fdtdec.c')
| -rw-r--r-- | lib/fdtdec.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index eb5aa20526..c2f3645253 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -70,6 +70,8 @@ static const char * const compat_names[COMPAT_COUNT] = { COMPAT(SANDBOX_LCD_SDL, "sandbox,lcd-sdl"), COMPAT(TI_TPS65090, "ti,tps65090"), COMPAT(COMPAT_NXP_PTN3460, "nxp,ptn3460"), + COMPAT(SAMSUNG_EXYNOS_SYSMMU, "samsung,sysmmu-v3.3"), + COMPAT(PARADE_PS8625, "parade,ps8625"), }; const char *fdtdec_get_compatible(enum fdt_compat_id id) |
