From: Tom Rini Date: Sun, 30 Sep 2018 02:28:44 +0000 (-0400) Subject: Merge branch 'master' of git://git.denx.de/u-boot-video X-Git-Tag: v2018.11-rc1~26 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b592936d357f6c648f59ae0e3159149df3a942fb;p=oweals%2Fu-boot.git Merge branch 'master' of git://git.denx.de/u-boot-video Signed-off-by: Tom Rini --- b592936d357f6c648f59ae0e3159149df3a942fb diff --cc configs/sandbox_defconfig index fb71998235,af8375e22e..e4f82a8408 --- a/configs/sandbox_defconfig +++ b/configs/sandbox_defconfig @@@ -192,10 -193,8 +193,12 @@@ CONFIG_CONSOLE_ROTATION= CONFIG_CONSOLE_TRUETYPE=y CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y CONFIG_VIDEO_SANDBOX_SDL=y +CONFIG_W1=y +CONFIG_W1_GPIO=y +CONFIG_W1_EEPROM=y +CONFIG_W1_EEPROM_SANDBOX=y + CONFIG_OSD=y + CONFIG_SANDBOX_OSD=y CONFIG_WDT=y CONFIG_WDT_SANDBOX=y CONFIG_FS_CBFS=y diff --cc include/dm/uclass-id.h index e6fc3ab92b,15abdce5e5..cefd9d7983 --- a/include/dm/uclass-id.h +++ b/include/dm/uclass-id.h @@@ -93,8 -92,7 +93,9 @@@ enum uclass_id UCLASS_VIDEO, /* Video or LCD device */ UCLASS_VIDEO_BRIDGE, /* Video bridge, e.g. DisplayPort to LVDS */ UCLASS_VIDEO_CONSOLE, /* Text console driver for video device */ + UCLASS_VIDEO_OSD, /* On-screen display */ + UCLASS_W1, /* Dallas 1-Wire bus */ + UCLASS_W1_EEPROM, /* one-wire EEPROMs */ UCLASS_WDT, /* Watchdot Timer driver */ UCLASS_COUNT,