[U-Boot] [PATCHv2 1/2] stdio_dev.h: Drop the video section as it is unused
With tighter build flags the fact that this header referenced uchar/ushort without including what typedefs it causes an error. Rather than add another include here, drop the section in question as it is unused.
Reported-by: Peter Robinson pbrobinson@gmail.com Tested-by: Peter Robinson pbrobinson@gmail.com Signed-off-by: Tom Rini trini@konsulko.com --- Changes in v2: - Reword slightly, add Tested-by --- 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[];
With tighter build flags the fact that <stdio_dev.h> doesn't have a reference back to MAX_NAMES causes an error. Include <stdio.h> here and then in common/console.c use MAX_NAMES rather than 3 when working with stdio_names.
Reported-by: Peter Robinson pbrobinson@gmail.com Signed-off-by: Tom Rini trini@konsulko.com --- Changes in v2: - New patch --- common/console.c | 4 ++-- include/stdio_dev.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/console.c b/common/console.c index 0e0295514b21..f1a5e95c8f39 100644 --- a/common/console.c +++ b/common/console.c @@ -847,7 +847,7 @@ done:
#ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE /* set the environment variables (will overwrite previous env settings) */ - for (i = 0; i < 3; i++) { + for (i = 0; i < MAX_NAMES; i++) { env_set(stdio_names[i], stdio_devices[i]->name); } #endif /* CONFIG_SYS_CONSOLE_ENV_OVERWRITE */ @@ -926,7 +926,7 @@ int console_init_r(void) #endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */
/* Setting environment variables */ - for (i = 0; i < 3; i++) { + for (i = 0; i < MAX_NAMES; i++) { env_set(stdio_names[i], stdio_devices[i]->name); }
diff --git a/include/stdio_dev.h b/include/stdio_dev.h index 1ea8bff47bab..c2a88b4fc416 100644 --- a/include/stdio_dev.h +++ b/include/stdio_dev.h @@ -8,6 +8,7 @@ #ifndef _STDIO_DEV_H_ #define _STDIO_DEV_H_
+#include <stdio.h> #include <linux/list.h>
/*
On Thu, May 3, 2018 at 2:12 PM, Tom Rini trini@konsulko.com wrote:
With tighter build flags the fact that <stdio_dev.h> doesn't have a reference back to MAX_NAMES causes an error. Include <stdio.h> here and then in common/console.c use MAX_NAMES rather than 3 when working with stdio_names.
Reported-by: Peter Robinson pbrobinson@gmail.com Signed-off-by: Tom Rini trini@konsulko.com
Changes in v2:
- New patch
common/console.c | 4 ++-- include/stdio_dev.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/console.c b/common/console.c index 0e0295514b21..f1a5e95c8f39 100644 --- a/common/console.c +++ b/common/console.c @@ -847,7 +847,7 @@ done:
#ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE /* set the environment variables (will overwrite previous env settings) */
for (i = 0; i < 3; i++) {
for (i = 0; i < MAX_NAMES; i++) {
I think you mean MAX_FILES? With MAX_NAMES it fails, with MAX_FILES it builds.
With the that change, if it's correct: Tested-by: Peter Robinson pbrobinson@gmail.com
env_set(stdio_names[i], stdio_devices[i]->name); }#endif /* CONFIG_SYS_CONSOLE_ENV_OVERWRITE */ @@ -926,7 +926,7 @@ int console_init_r(void) #endif /* CONFIG_SYS_CONSOLE_INFO_QUIET */
/* Setting environment variables */
for (i = 0; i < 3; i++) {
for (i = 0; i < MAX_NAMES; i++) { env_set(stdio_names[i], stdio_devices[i]->name); }diff --git a/include/stdio_dev.h b/include/stdio_dev.h index 1ea8bff47bab..c2a88b4fc416 100644 --- a/include/stdio_dev.h +++ b/include/stdio_dev.h @@ -8,6 +8,7 @@ #ifndef _STDIO_DEV_H_ #define _STDIO_DEV_H_
+#include <stdio.h> #include <linux/list.h>
/*
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 03:12:47PM +0100, Peter Robinson wrote:
On Thu, May 3, 2018 at 2:12 PM, Tom Rini trini@konsulko.com wrote:
With tighter build flags the fact that <stdio_dev.h> doesn't have a reference back to MAX_NAMES causes an error. Include <stdio.h> here and then in common/console.c use MAX_NAMES rather than 3 when working with stdio_names.
Reported-by: Peter Robinson pbrobinson@gmail.com Signed-off-by: Tom Rini trini@konsulko.com
Changes in v2:
- New patch
common/console.c | 4 ++-- include/stdio_dev.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/common/console.c b/common/console.c index 0e0295514b21..f1a5e95c8f39 100644 --- a/common/console.c +++ b/common/console.c @@ -847,7 +847,7 @@ done:
#ifdef CONFIG_SYS_CONSOLE_ENV_OVERWRITE /* set the environment variables (will overwrite previous env settings) */
for (i = 0; i < 3; i++) {
for (i = 0; i < MAX_NAMES; i++) {I think you mean MAX_FILES? With MAX_NAMES it fails, with MAX_FILES it builds.
With the that change, if it's correct: Tested-by: Peter Robinson pbrobinson@gmail.com
If anyone is wonder if I'll ever learn to not post something I quickly did and was sure it was right, the answer is no. But I don't push those changes out (on purpose) at least! I'll fix it up before merging, thanks!
On Thu, May 03, 2018 at 09:12:26AM -0400, Tom Rini wrote:
With tighter build flags the fact that <stdio_dev.h> doesn't have a reference back to MAX_NAMES causes an error. Include <stdio.h> here and then in common/console.c use MAX_NAMES rather than 3 when working with stdio_names.
Reported-by: Peter Robinson pbrobinson@gmail.com Signed-off-by: Tom Rini trini@konsulko.com Tested-by: Peter Robinson pbrobinson@gmail.com
Applied to u-boot/master, thanks!
On Thu, May 03, 2018 at 09:12:25AM -0400, Tom Rini wrote:
With tighter build flags the fact that this header referenced uchar/ushort without including what typedefs it causes an error. Rather than add another include here, drop the section in question as it is unused.
Reported-by: Peter Robinson pbrobinson@gmail.com Tested-by: Peter Robinson pbrobinson@gmail.com Signed-off-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
participants (2)
-
Peter Robinson -
Tom Rini