diff options
| author | Simon Glass <sjg@chromium.org> | 2016-01-19 02:52:25 (GMT) |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2016-01-21 02:10:16 (GMT) |
| commit | 3ade5bc4dc24edf5e1f13f3c43a9e8b7f8c2d853 (patch) | |
| tree | e276da8f4b751ea7feecf32fa750e71671bfa7f2 /include | |
| parent | 1e69ad014c68bf375ba2113486c5c0095d3292d0 (diff) | |
| download | u-boot-fsl-qoriq-3ade5bc4dc24edf5e1f13f3c43a9e8b7f8c2d853.tar.xz | |
dm: video: sandbox: Convert sandbox to use driver model for video
Now that driver model support is available, convert sandbox over to use it.
We can remove a few of the special hooks that sandbox currently has.
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Anatolij Gustschin <agust@denx.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/sandbox.h | 10 | ||||
| -rw-r--r-- | include/fdtdec.h | 1 |
2 files changed, 4 insertions, 7 deletions
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index e1be603..23ae44c 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -158,9 +158,7 @@ /* LCD and keyboard require SDL support */ #ifdef CONFIG_SANDBOX_SDL -#define CONFIG_LCD #define CONFIG_CMD_BMP -#define CONFIG_BOARD_EARLY_INIT_F #define CONFIG_CONSOLE_MUX #define CONFIG_SYS_CONSOLE_IS_IN_ENV #define LCD_BPP LCD_COLOR16 @@ -169,12 +167,12 @@ #define CONFIG_KEYBOARD #define SANDBOX_SERIAL_SETTINGS "stdin=serial,cros-ec-keyb,usbkbd\0" \ - "stdout=serial,lcd\0" \ - "stderr=serial,lcd\0" + "stdout=serial,lcd.vidconsole\0" \ + "stderr=serial,lcd.vidconsole\0" #else #define SANDBOX_SERIAL_SETTINGS "stdin=serial\0" \ - "stdout=serial,lcd\0" \ - "stderr=serial,lcd\0" + "stdout=serial,lcd.vidconsole\0" \ + "stderr=serial,lcd.vidconsole\0" #endif #define SANDBOX_ETH_SETTINGS "ethaddr=00:00:11:22:33:44\0" \ diff --git a/include/fdtdec.h b/include/fdtdec.h index 27b350e..25e98c9 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -151,7 +151,6 @@ enum fdt_compat_id { COMPAT_GENERIC_SPI_FLASH, /* Generic SPI Flash chip */ COMPAT_MAXIM_98095_CODEC, /* MAX98095 Codec */ COMPAT_SAMSUNG_EXYNOS5_I2C, /* Exynos5 High Speed I2C Controller */ - COMPAT_SANDBOX_LCD_SDL, /* Sandbox LCD emulation with SDL */ COMPAT_SAMSUNG_EXYNOS_SYSMMU, /* Exynos sysmmu */ COMPAT_INTEL_MICROCODE, /* Intel microcode update */ COMPAT_MEMORY_SPD, /* Memory SPD information */ |