Message ID | 1525298992-4740-1-git-send-email-trini@konsulko.com |
---|---|
State | Changes Requested |
Delegated to: | Tom Rini |
Headers | show |
Series | [U-Boot] stdio_dev.h: Drop the video section as it is unused | expand |
On Wed, May 2, 2018 at 11:09 PM, Tom Rini <trini@konsulko.com> wrote: > With tighter build flags the fact that this header referenced > uchar/ushort without including what typedefs it causes warnings. Rather > than add another include here, drop the section in question as it is > unused. This doesn't completely fix my problem, with this patch applied I still get a build failure from this file this time for MAX_FILES, so it likely needs a "#include <stdio.h>" as well which was added via the include common.h in my previous patch Error was: /builddir/build/BUILD/u-boot-2018.05-rc3/include/stdio_dev.h:55:26: error: 'MAX_FILES' undeclared here (not in a function) Peter > Reported-by: Peter Robinson <pbrobinson@gmail.com> > Signed-off-by: Tom Rini <trini@konsulko.com> > --- > include/stdio_dev.h | 18 ------------------ > 1 file changed, 18 deletions(-) > > diff --git a/include/stdio_dev.h b/include/stdio_dev.h > index 3164fa2a5579..1ea8bff47bab 100644 > --- a/include/stdio_dev.h > +++ b/include/stdio_dev.h > @@ -49,24 +49,6 @@ struct stdio_dev { > }; > > /* > - * VIDEO EXTENSIONS > - */ > -#define VIDEO_FORMAT_RGB_INDEXED 0x0000 > -#define VIDEO_FORMAT_RGB_DIRECTCOLOR 0x0001 > -#define VIDEO_FORMAT_YUYV_4_4_4 0x0010 > -#define VIDEO_FORMAT_YUYV_4_2_2 0x0011 > - > -typedef struct { > - void *address; /* Address of framebuffer */ > - ushort width; /* Horizontal resolution */ > - ushort height; /* Vertical resolution */ > - uchar format; /* Format */ > - uchar colors; /* Colors number or color depth */ > - void (*setcolreg) (int, int, int, int); > - void (*getcolreg) (int, void *); > -} video_ext_t; > - > -/* > * VARIABLES > */ > extern struct stdio_dev *stdio_devices[]; > -- > 2.7.4 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot
On Thu, May 03, 2018 at 12:38:34AM +0100, Peter Robinson wrote: > On Wed, May 2, 2018 at 11:09 PM, Tom Rini <trini@konsulko.com> wrote: > > With tighter build flags the fact that this header referenced > > uchar/ushort without including what typedefs it causes warnings. Rather > > than add another include here, drop the section in question as it is > > unused. > > This doesn't completely fix my problem, with this patch applied I > still get a build failure from this file this time for MAX_FILES, so > it likely needs a "#include <stdio.h>" as well which was added via the > include common.h in my previous patch > > Error was: > /builddir/build/BUILD/u-boot-2018.05-rc3/include/stdio_dev.h:55:26: > error: 'MAX_FILES' undeclared here (not in a function) If you pop in stdio.h does anything else pop up? I'll do a v2 with a separate patch to MAX_FILES / stdio_names (since a few places use 3 directly). Thanks!
diff --git a/include/stdio_dev.h b/include/stdio_dev.h index 3164fa2a5579..1ea8bff47bab 100644 --- a/include/stdio_dev.h +++ b/include/stdio_dev.h @@ -49,24 +49,6 @@ struct stdio_dev { }; /* - * VIDEO EXTENSIONS - */ -#define VIDEO_FORMAT_RGB_INDEXED 0x0000 -#define VIDEO_FORMAT_RGB_DIRECTCOLOR 0x0001 -#define VIDEO_FORMAT_YUYV_4_4_4 0x0010 -#define VIDEO_FORMAT_YUYV_4_2_2 0x0011 - -typedef struct { - void *address; /* Address of framebuffer */ - ushort width; /* Horizontal resolution */ - ushort height; /* Vertical resolution */ - uchar format; /* Format */ - uchar colors; /* Colors number or color depth */ - void (*setcolreg) (int, int, int, int); - void (*getcolreg) (int, void *); -} video_ext_t; - -/* * VARIABLES */ extern struct stdio_dev *stdio_devices[];
With tighter build flags the fact that this header referenced uchar/ushort without including what typedefs it causes warnings. Rather than add another include here, drop the section in question as it is unused. Reported-by: Peter Robinson <pbrobinson@gmail.com> Signed-off-by: Tom Rini <trini@konsulko.com> --- include/stdio_dev.h | 18 ------------------ 1 file changed, 18 deletions(-)