Changeset 192565b in mainline for kernel/genarch/Makefile.inc

Timestamp:

2013-05-27T13:18:13Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

f2c19b0

Parents:

d120133 (diff), c90aed4 (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) (3 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_AM335X_UART),y)
+ifeq ($(CONFIG_OMAP_UART),y)
         GENARCH_SOURCES += \
-                genarch/src/drivers/am335x/uart.c
+                genarch/src/drivers/omap/uart.c
 endif
 
@@ -114 +113 @@
         GENARCH_SOURCES += \
                 genarch/src/drivers/am335x/timer.c
-endif
-
-ifeq ($(CONFIG_AMDM37X_UART),y)
-        GENARCH_SOURCES += \
-                genarch/src/drivers/amdm37x/uart.c
 endif