Merge git://git.denx.de/u-boot-x86

[people/ms/u-boot.git] / include / stdio_dev.h

diff --git a/include/stdio_dev.h b/include/stdio_dev.h
index 24da23fe501196d650ff71d5062d3528ce362160..3164fa2a557960482b0fd5d4a4ba5e2ba08f5318 100644 (file)
--- a/include/stdio_dev.h
+++ b/include/stdio_dev.h
@@ -16,14 +16,13 @@
 
 #define DEV_FLAGS_INPUT         0x00000001     /* Device can be used as input  console */
 #define DEV_FLAGS_OUTPUT 0x00000002    /* Device can be used as output console */
-#define DEV_FLAGS_SYSTEM 0x80000000    /* Device is a system device            */
-#define DEV_EXT_VIDEO   0x00000001     /* Video extensions supported           */
+#define DEV_FLAGS_DM     0x00000004    /* Device priv is a struct udevice * */
 
 /* Device information */
 struct stdio_dev {
        int     flags;                  /* Device flags: input/output/system    */
        int     ext;                    /* Supported extensions                 */
-       char    name[16];               /* Device name                          */
+       char    name[32];               /* Device name                          */
 
 /* GENERAL functions */
 
@@ -102,7 +101,7 @@ int stdio_add_devices(void);
 int stdio_init(void);
 
 void   stdio_print_current_devices(void);
-#ifdef CONFIG_SYS_STDIO_DEREGISTER
+#if CONFIG_IS_ENABLED(SYS_STDIO_DEREGISTER)
 int stdio_deregister(const char *devname, int force);
 int stdio_deregister_dev(struct stdio_dev *dev, int force);
 #endif