diff options
| author | Tom Rini <trini@ti.com> | 2014-05-09 18:48:26 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-05-09 18:48:26 -0400 |
| commit | f4617ef86dbbc2b844d530564694b927099bf0a9 (patch) | |
| tree | 33dd41efabe14ad2ce99559f556fa6f22841f8a5 /include | |
| parent | bcb879c0e37db1cf527ff408df93918f155012ea (diff) | |
| parent | 097c5de5f4a64d3b121dc1dbe020f7f2545dabdb (diff) | |
| download | u-boot-imx-f4617ef86dbbc2b844d530564694b927099bf0a9.zip u-boot-imx-f4617ef86dbbc2b844d530564694b927099bf0a9.tar.gz u-boot-imx-f4617ef86dbbc2b844d530564694b927099bf0a9.tar.bz2 | |
Merge branch 'tom' of git://git.denx.de/u-boot-x86
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/sandbox.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index fa62cb6..6bb2546 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -140,8 +140,6 @@ #define CONFIG_CROS_EC #define CONFIG_CMD_CROS_EC #define CONFIG_CROS_EC_SANDBOX -#define CONFIG_KEYBOARD -#define CONFIG_CROS_EC_KEYB #define CONFIG_ARCH_EARLY_INIT_R #define CONFIG_BOARD_LATE_INIT @@ -149,7 +147,12 @@ #define CONFIG_SOUND_SANDBOX #define CONFIG_CMD_SOUND +#ifndef SANDBOX_NO_SDL #define CONFIG_SANDBOX_SDL +#endif + +/* LCD and keyboard require SDL support */ +#ifdef CONFIG_SANDBOX_SDL #define CONFIG_LCD #define CONFIG_VIDEO_SANDBOX_SDL #define CONFIG_CMD_BMP @@ -158,9 +161,18 @@ #define CONFIG_SYS_CONSOLE_IS_IN_ENV #define LCD_BPP LCD_COLOR16 +#define CONFIG_CROS_EC_KEYB +#define CONFIG_KEYBOARD + #define CONFIG_EXTRA_ENV_SETTINGS "stdin=serial,cros-ec-keyb\0" \ "stdout=serial,lcd\0" \ "stderr=serial,lcd\0" +#else + +#define CONFIG_EXTRA_ENV_SETTINGS "stdin=serial\0" \ + "stdout=serial,lcd\0" \ + "stderr=serial,lcd\0" +#endif #define CONFIG_GZIP_COMPRESSED #define CONFIG_BZIP2 |