Merge branch 'master' of git://git.denx.de/u-boot-video

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --cc cmd/Kconfig
Simple merge

diff --cc cmd/Makefile
Simple merge

diff --cc configs/sandbox_defconfig
index fb71998,af8375e..e4f82a8
--- 1/configs/sandbox_defconfig
--- 2/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 e6fc3ab,15abdce..cefd9d7
--- 1/include/dm/uclass-id.h
--- 2/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,