Changeset 66be0288 in mainline for kernel/genarch/Makefile.inc

Timestamp:

2014-01-17T17:02:59Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

476f62c, facc34d

Parents:

2e80321 (diff), 61b5b73d (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:

Mainline changes

File:

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

kernel/genarch/Makefile.inc

@@ -90 +90 @@
 endif
 
-ifeq ($(CONFIG_ARM926_UART),y)
+ifeq ($(CONFIG_PL011_UART),y)
         GENARCH_SOURCES += \
-                genarch/src/drivers/arm926_uart/arm926_uart.c
+                genarch/src/drivers/pl011/pl011.c
 endif
 
@@ -123 +123 @@
         GENARCH_SOURCES += \
                 genarch/src/drivers/am335x/timer.c
+endif
+
+ifeq ($(CONFIG_BCM2835_MAILBOX),y)
+        GENARCH_SOURCES += \
+                genarch/src/drivers/bcm2835/mbox.c
 endif