Changeset 30413b31 in mainline for kernel/genarch/src/fb/bfb.c

Timestamp:

2011-12-10T08:29:44Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

d9f8dd13

Parents:

b8b1e631 (diff), 87955bfb (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 with mainline

File:

• kernel/genarch/src/fb/bfb.c (modified) (2 diffs)

kernel/genarch/src/fb/bfb.c

@@ -40 +40 @@
 #include <console/console.h>
 
-uintptr_t bfb_addr = (uintptr_t) -1;
+uintptr_t bfb_addr = 0;
 uint32_t bfb_width = 0;
 uint32_t bfb_height = 0;
@@ -57 +57 @@
 bool bfb_init(void)
 {
-        if ((bfb_width == 0) || (bfb_height == 0))
+        if ((bfb_addr == 0) || (bfb_width == 0) || (bfb_height == 0) ||
+            (bfb_bpp == 0) || (bfb_scanline == 0))
                 return false;