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

Timestamp:

2011-09-04T11:30:58Z (14 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/integratorcp/integratorcp.c (modified) (2 diffs)

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

@@ -48 +48 @@
 #include <arch/mach/integratorcp/integratorcp.h>
 #include <genarch/fb/fb.h>
-#include <genarch/fb/visuals.h>
+#include <abi/fb/visuals.h>
 #include <ddi/ddi.h>
 #include <print.h>
 
 #define SDRAM_SIZE      (sdram[((*(uint32_t *)(ICP_CMCR+ICP_SDRAMCR_OFFSET) & ICP_SDRAM_MASK) >> 2)])
-static parea_t fb_parea;
 static icp_hw_map_t icp_hw_map;
 static irq_t icp_timer_irq;
@@ -296 +295 @@
         
         outdev_t *fbdev = fb_init(&prop);
-        if (fbdev) {
+        if (fbdev)
                 stdout_wire(fbdev);
-                fb_parea.pbase = ICP_FB;
-                fb_parea.frames = 300;
-                fb_parea.unpriv = false;
-                ddi_parea_register(&fb_parea);
-        }
 #endif
 }