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

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:

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

kernel/genarch/Makefile.inc

@@ -85 +85 @@
 endif
 
+ifeq ($(CONFIG_I8259),y)
+GENARCH_SOURCES += \
+        genarch/src/drivers/i8259/i8259.c
+endif
+
 ifeq ($(CONFIG_NS16550),y)
 GENARCH_SOURCES += \
@@ -117 +122 @@
 ifeq ($(CONFIG_BCM2835_MAILBOX),y)
 GENARCH_SOURCES += \
-        genarch/src/drivers/bcm2835/mbox.c
+        genarch/src/drivers/bcm2835/irc.c \
+        genarch/src/drivers/bcm2835/mbox.c \
+        genarch/src/drivers/bcm2835/timer.c
+endif
+
+ifeq ($(CONFIG_GICV2), y)
+GENARCH_SOURCES += \
+        genarch/src/drivers/gicv2/gicv2.c
 endif