summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2015-11-05 07:47:21 -0500
committerTom Rini <trini@konsulko.com>2015-11-05 07:47:21 -0500
commited02c532be690b3d0c3e15c81531785a788fd949 (patch)
treefe6790c023fe118cb24d07106cddfc592a39d1e3 /board
parent60b25259a5540686add02cf6c94cd7494a3e2d23 (diff)
parent4b6d09449fdeaa5659c5d277bdf133457521e70b (diff)
downloadu-boot-imx-ed02c532be690b3d0c3e15c81531785a788fd949.zip
u-boot-imx-ed02c532be690b3d0c3e15c81531785a788fd949.tar.gz
u-boot-imx-ed02c532be690b3d0c3e15c81531785a788fd949.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-video
Diffstat (limited to 'board')
-rw-r--r--board/bf527-ezkit/video.c2
-rw-r--r--board/bf533-stamp/video.c2
-rw-r--r--board/bf548-ezkit/video.c2
-rw-r--r--board/cm-bf548/video.c2
-rw-r--r--board/kosagi/novena/novena.c2
-rw-r--r--board/mpl/common/kbd.c2
-rw-r--r--board/mpl/pati/pati.c2
7 files changed, 3 insertions, 11 deletions
diff --git a/board/bf527-ezkit/video.c b/board/bf527-ezkit/video.c
index c2bf145..a57f9fe 100644
--- a/board/bf527-ezkit/video.c
+++ b/board/bf527-ezkit/video.c
@@ -438,8 +438,6 @@ int drv_video_init(void)
memset(&videodev, 0, sizeof(videodev));
strcpy(videodev.name, "video");
- videodev.ext = DEV_EXT_VIDEO; /* Video extensions */
- videodev.flags = DEV_FLAGS_SYSTEM; /* No Output */
error = stdio_register(&videodev);
diff --git a/board/bf533-stamp/video.c b/board/bf533-stamp/video.c
index 75b8adc..e9b9a9a 100644
--- a/board/bf533-stamp/video.c
+++ b/board/bf533-stamp/video.c
@@ -164,8 +164,6 @@ int drv_video_init(void)
memset(&videodev, 0, sizeof(videodev));
strcpy(videodev.name, "video");
- videodev.ext = DEV_EXT_VIDEO;
- videodev.flags = DEV_FLAGS_SYSTEM;
return stdio_register(&videodev);
}
diff --git a/board/bf548-ezkit/video.c b/board/bf548-ezkit/video.c
index 47e68c6..3765993 100644
--- a/board/bf548-ezkit/video.c
+++ b/board/bf548-ezkit/video.c
@@ -328,8 +328,6 @@ int drv_video_init(void)
memset(&videodev, 0, sizeof(videodev));
strcpy(videodev.name, "video");
- videodev.ext = DEV_EXT_VIDEO; /* Video extensions */
- videodev.flags = DEV_FLAGS_SYSTEM; /* No Output */
error = stdio_register(&videodev);
diff --git a/board/cm-bf548/video.c b/board/cm-bf548/video.c
index b098615..b8cc873 100644
--- a/board/cm-bf548/video.c
+++ b/board/cm-bf548/video.c
@@ -332,8 +332,6 @@ int drv_video_init(void)
memset(&videodev, 0, sizeof(videodev));
strcpy(videodev.name, "video");
- videodev.ext = DEV_EXT_VIDEO; /* Video extensions */
- videodev.flags = DEV_FLAGS_SYSTEM; /* No Output */
error = stdio_register(&videodev);
diff --git a/board/kosagi/novena/novena.c b/board/kosagi/novena/novena.c
index 69f5be3..919133b 100644
--- a/board/kosagi/novena/novena.c
+++ b/board/kosagi/novena/novena.c
@@ -77,7 +77,7 @@ int drv_keyboard_init(void)
int error;
struct stdio_dev dev = {
.name = "button",
- .flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM,
+ .flags = DEV_FLAGS_INPUT,
.start = novena_gpio_button_init,
.getc = novena_gpio_button_getc,
.tstc = novena_gpio_button_tstc,
diff --git a/board/mpl/common/kbd.c b/board/mpl/common/kbd.c
index 99de2ca..1da72c5 100644
--- a/board/mpl/common/kbd.c
+++ b/board/mpl/common/kbd.c
@@ -203,7 +203,7 @@ int drv_isa_kbd_init (void)
return -1;
memset (&kbddev, 0, sizeof(kbddev));
strcpy(kbddev.name, DEVNAME);
- kbddev.flags = DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
+ kbddev.flags = DEV_FLAGS_INPUT;
kbddev.getc = kbd_getc ;
kbddev.tstc = kbd_testc ;
diff --git a/board/mpl/pati/pati.c b/board/mpl/pati/pati.c
index b9d88ee..958cdec 100644
--- a/board/mpl/pati/pati.c
+++ b/board/mpl/pati/pati.c
@@ -566,7 +566,7 @@ void pci_con_connect(void)
irq_install_handler (0x2, (interrupt_handler_t *) pci_dorbell_irq,NULL);
memset (&pci_con_dev, 0, sizeof (pci_con_dev));
strcpy (pci_con_dev.name, "pci_con");
- pci_con_dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT | DEV_FLAGS_SYSTEM;
+ pci_con_dev.flags = DEV_FLAGS_OUTPUT | DEV_FLAGS_INPUT;
pci_con_dev.putc = pci_con_putc;
pci_con_dev.puts = pci_con_puts;
pci_con_dev.getc = pci_con_getc;