Changeset 8ff0bd2 in mainline for kernel/arch/arm32/src/mach/gta02/gta02.c

Timestamp:

2011-09-04T11:30:58Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

03bc76a

Parents:

d2c67e7 (diff), deac215e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/arch/arm32/src/mach/gta02/gta02.c (modified) (3 diffs)

kernel/arch/arm32/src/mach/gta02/gta02.c

@@ -39 +39 @@
 #include <mm/page.h>
 #include <genarch/fb/fb.h>
-#include <genarch/fb/visuals.h>
+#include <abi/fb/visuals.h>
 #include <genarch/drivers/s3c24xx_uart/s3c24xx_uart.h>
 #include <genarch/drivers/s3c24xx_irqc/s3c24xx_irqc.h>
@@ -158 +158 @@
 {
 #ifdef CONFIG_FB
-        parea_t fb_parea;
-
         fb_properties_t prop = {
                 .addr = GTA02_FB_BASE,
@@ -170 +168 @@
 
         outdev_t *fb_dev = fb_init(&prop);
-        if (fb_dev) {
+        if (fb_dev)
                 stdout_wire(fb_dev);
-                fb_parea.pbase = GTA02_FB_BASE;
-                fb_parea.frames = 150;
-                fb_parea.unpriv = false;
-                ddi_parea_register(&fb_parea);
-        }
 #endif
 
         /* Initialize serial port of the debugging console. */
-        s3c24xx_uart_io_t *scons_io;
-
-        scons_io = (void *) hw_map(GTA02_SCONS_BASE, PAGE_SIZE);
-        gta02_scons_dev = s3c24xx_uart_init(scons_io, S3C24XX_INT_UART2);
+        gta02_scons_dev =
+            s3c24xx_uart_init(GTA02_SCONS_BASE, S3C24XX_INT_UART2);
 
         if (gta02_scons_dev) {