Changeset 86ffa27f in mainline for kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

Timestamp:

2011-08-07T11:21:44Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

cc574511

Parents:

15f3c3f (diff), e8067c0 (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

@@ -53 +53 @@
 
 #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
 }