Changeset 25eec4e in mainline for kernel/genarch/Makefile.inc

Timestamp:

2013-04-19T18:38:18Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6d717a4

Parents:

a1e2df13 (diff), 289cb7dd (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 chages.

File:

• kernel/genarch/Makefile.inc (modified) (2 diffs)

kernel/genarch/Makefile.inc

@@ -66 +66 @@
         GENARCH_SOURCES += \
                 genarch/src/fb/font-8x16.c \
-                genarch/src/fb/logo-196x66.c \
                 genarch/src/fb/fb.c \
                 genarch/src/fb/bfb.c
@@ -104 +103 @@
         GENARCH_SOURCES += \
                 genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c
+endif
+
+ifeq ($(CONFIG_AM335X_UART),y)
+        GENARCH_SOURCES += \
+                genarch/src/drivers/am335x/uart.c
+endif
+
+ifeq ($(CONFIG_AM335X_TIMERS),y)
+        GENARCH_SOURCES += \
+                genarch/src/drivers/am335x/timer.c
+endif
+
+ifeq ($(CONFIG_AMDM37X_UART),y)
+        GENARCH_SOURCES += \
+                genarch/src/drivers/amdm37x/uart.c
 endif