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

Timestamp:

2014-01-19T14:37:22Z (10 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

cf982ff

Parents:

2f591127 (diff), 476f62c (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) (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
 
 ifeq ($(CONFIG_S3C24XX_IRQC),y)
         GENARCH_SOURCES += \
-                genarch/src/drivers/s3c24xx_irqc/s3c24xx_irqc.c
+                genarch/src/drivers/s3c24xx/irqc.c
 endif
 
 ifeq ($(CONFIG_S3C24XX_UART),y)
         GENARCH_SOURCES += \
-                genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c
+                genarch/src/drivers/s3c24xx/uart.c
 endif
 
@@ -110 +110 @@
 endif
 
+ifeq ($(CONFIG_GRLIB_UART),y)
+        GENARCH_SOURCES += \
+                genarch/src/drivers/grlib/uart.c
+endif
+
+ifeq ($(CONFIG_GRLIB_IRQMP),y)
+        GENARCH_SOURCES += \
+                genarch/src/drivers/grlib/irqmp.c
+endif
+
 ifeq ($(CONFIG_AM335X_TIMERS),y)
         GENARCH_SOURCES += \
                 genarch/src/drivers/am335x/timer.c
+endif
+
+ifeq ($(CONFIG_BCM2835_MAILBOX),y)
+        GENARCH_SOURCES += \
+                genarch/src/drivers/bcm2835/mbox.c
 endif