diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:13:00 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-03 21:13:00 +0200 |
| commit | d7609640e7cb9d213b9d3cbcf9394c677719d369 (patch) | |
| tree | 1487faa310e5f6dd91a5d033644abb470b8f3719 /arch/sandbox/board | |
| parent | d1e65d2a7bd9162e7009da870adb15c70b620320 (diff) | |
| parent | 9d73b518fc3c61640123f8499aab7f8373e41dbd (diff) | |
| download | barebox-d7609640e7cb9d213b9d3cbcf9394c677719d369.tar.gz barebox-d7609640e7cb9d213b9d3cbcf9394c677719d369.tar.xz | |
Merge branch 'for-next/sandbox'
Conflicts:
arch/sandbox/mach-sandbox/include/mach/linux.h
Diffstat (limited to 'arch/sandbox/board')
| -rw-r--r-- | arch/sandbox/board/board.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/sandbox/board/board.c b/arch/sandbox/board/board.c index 5d4f5e042d..91fe9bdbc5 100644 --- a/arch/sandbox/board/board.c +++ b/arch/sandbox/board/board.c @@ -23,16 +23,37 @@ #include <mach/linux.h> #include <init.h> #include <errno.h> +#include <fb.h> + +struct fb_videomode mode = { + .name = "sdl", /* optional */ + .xres = 640, + .yres = 480, +}; static struct device_d tap_device = { .id = DEVICE_ID_DYNAMIC, .name = "tap", }; +static struct device_d sdl_device = { + .id = DEVICE_ID_DYNAMIC, + .name = "sdlfb", + .platform_data = &mode, +}; + static int devices_init(void) { register_device(&tap_device); + if (sdl_xres) + mode.xres = sdl_xres; + + if (sdl_yres) + mode.yres = sdl_yres; + + register_device(&sdl_device); + return 0; } |