Changeset 411b6a6 in mainline for kernel/genarch/Makefile.inc

Timestamp:

2009-03-07T16:08:40Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4c84368e

Parents:

e06da7e

Message:

Complete emancipation of kernel serial controller drivers (i8042, ns16550 and
z8530). Provide a common keyboard module for PC and Sun keyboards. The serial
line module is still to follow.

File:

• kernel/genarch/Makefile.inc (modified) (1 diff)

kernel/genarch/Makefile.inc

@@ -71 +71 @@
 ifeq ($(CONFIG_I8042),y)
         GENARCH_SOURCES += \
-                genarch/src/kbd/i8042.c \
-                genarch/src/kbd/key.c \
-                genarch/src/kbd/scanc_pc.c
+                genarch/src/drivers/i8042/i8042.c
+endif
+
+ifeq ($(CONFIG_NS16550),y)
+        GENARCH_SOURCES += \
+                genarch/src/drivers/ns16550/ns16550.c
+endif
+
+ifeq ($(CONFIG_Z8530),y)
+        GENARCH_SOURCES += \
+                genarch/src/drivers/z8530/z8530.c
+endif
+
+ifeq ($(CONFIG_PC_KBD),y)
+        GENARCH_SOURCES += \
+                genarch/src/kbrd/kbrd.c \
+                genarch/src/kbrd/scanc_pc.c
 endif
 
 ifeq ($(CONFIG_SUN_KBD),y)
         GENARCH_SOURCES += \
-                genarch/src/kbd/key.c \
-                genarch/src/kbd/scanc_sun.c
+                genarch/src/kbrd/kbrd.c \
+                genarch/src/kbrd/scanc_sun.c
 endif
 
-ifeq ($(CONFIG_Z8530),y)
-        GENARCH_SOURCES += \
-                genarch/src/kbd/z8530.c
-endif
-
-ifeq ($(CONFIG_NS16550),y)
-        GENARCH_SOURCES += \
-                genarch/src/kbd/ns16550.c
-endif
-
-ifeq ($(CONFIG_OFW_TREE), y)
+ifeq ($(CONFIG_OFW_TREE),y)
         GENARCH_SOURCES += \
                 genarch/src/ofw/ofw_tree.c \