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

Timestamp:

2013-05-05T21:34:14Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

06fe3b6, 44ecf89

Parents:

716357f (diff), 69483af (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 the unified am335x/amdm37x uart kernel driver implementation

File:

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

kernel/genarch/Makefile.inc

@@ -105 +105 @@
 endif
 
-ifeq ($(CONFIG_AM335X_UART),y)
+ifeq ($(CONFIG_OMAP_UART),y)
         GENARCH_SOURCES += \
-                genarch/src/drivers/am335x/uart.c
+                genarch/src/drivers/omap/uart.c
 endif
 
@@ -113 +113 @@
         GENARCH_SOURCES += \
                 genarch/src/drivers/am335x/timer.c
-endif
-
-ifeq ($(CONFIG_AMDM37X_UART),y)
-        GENARCH_SOURCES += \
-                genarch/src/drivers/amdm37x/uart.c
 endif