Changeset 8ab339e in mainline for kernel/genarch/Makefile.inc

Timestamp:

2013-02-26T10:58:29Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b04ca9c

Parents:

1935591 (diff), 088b334 (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

File:

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

kernel/genarch/Makefile.inc

@@ -106 +106 @@
 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/amdm37x_uart.c
+                genarch/src/drivers/amdm37x/uart.c
 endif