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 /doc/device-tree-bindings/video | |
| 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 'doc/device-tree-bindings/video')
| -rw-r--r-- | doc/device-tree-bindings/video/sandbox-fb.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/device-tree-bindings/video/sandbox-fb.txt b/doc/device-tree-bindings/video/sandbox-fb.txt new file mode 100644 index 0000000..eb91b30 --- /dev/null +++ b/doc/device-tree-bindings/video/sandbox-fb.txt @@ -0,0 +1,13 @@ +Sandbox LCD +=========== + +This uses the displaymode.txt binding except that only xres and yres are +required properties. + +Example: + + lcd { + compatible = "sandbox,lcd-sdl"; + xres = <800>; + yres = <600>; + }; |