Changeset fe050b7 in mainline

Timestamp:

2006-02-14T10:14:07Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

95c7526

Parents:

bbf5657

Message:

Moved framebuffer to genarch.

Files:

• Makefile (modified) (1 diff)
• arch/mips32/src/console.c (modified) (1 diff)
• genarch/Makefile.inc (modified) (1 diff)
• genarch/include/fb/fb.h (moved) (moved from generic/include/fb/fb.h )
• genarch/include/fb/font-8x16.h (moved) (moved from generic/include/fb/font-8x16.h )
• genarch/src/fb/fb.c (moved) (moved from generic/src/fb/fb.c ) (1 diff)
• genarch/src/fb/font-8x16.c (moved) (moved from generic/src/fb/font-8x16.c ) (1 diff)

Makefile

@@ -135 +135 @@
         generic/src/smp/ipi.c
 
-## Framebuffer
-ifeq ($(CONFIG_FB),y)
-        GENERIC_SOURCES += \
-                generic/src/fb/font-8x16.c \
-                generic/src/fb/fb.c
-        DEFS += -DCONFIG_FB
-endif
-
 ## Test sources
 #

arch/mips32/src/console.c

@@ -32 +32 @@
 #include <arch/drivers/serial.h>
 #include <arch/drivers/msim.h>
-#include <fb/fb.h>
+#include <genarch/fb/fb.h>
 
 void console_init(void)

genarch/Makefile.inc

@@ -60 +60 @@
                 genarch/src/softint/division.c
 endif
+
+## Framebuffer
+ifeq ($(CONFIG_FB),y)
+        GENARCH_SOURCES += \
+                genarch/src/fb/font-8x16.c \
+                genarch/src/fb/fb.c
+        DEFS += -DCONFIG_FB
+endif

genarch/src/fb/fb.c

@@ -27 +27 @@
  */
 
-#include <fb/font-8x16.h>
-#include <fb/fb.h>
+#include <genarch/fb/font-8x16.h>
+#include <genarch/fb/fb.h>
 #include <console/chardev.h>
 #include <console/console.h>

genarch/src/fb/font-8x16.c

@@ -27 +27 @@
  */
 
-#include <fb/font-8x16.h>
+#include <genarch/fb/font-8x16.h>
 
 unsigned char fb_font[FONT_GLIPHS * FONT_SCANLINES] = {