Changeset db71e2a in mainline for kernel/genarch/Makefile.inc

Timestamp:

2013-07-24T17:42:25Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

69b264a9

Parents:

52f1882 (diff), cffa14e6 (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.

usb hc macro changes from mainline were reverted, too many conflicts

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
@@ -106 +105 @@
 endif
 
-ifeq ($(CONFIG_AMDM37X_UART),y)
+ifeq ($(CONFIG_OMAP_UART),y)
         GENARCH_SOURCES += \
-                genarch/src/drivers/amdm37x_uart/amdm37x_uart.c
+                genarch/src/drivers/omap/uart.c
+endif
+
+ifeq ($(CONFIG_AM335X_TIMERS),y)
+        GENARCH_SOURCES += \
+                genarch/src/drivers/am335x/timer.c
 endif