Changeset 41b735f3 in mainline for kernel/genarch/Makefile.inc

Timestamp:

2013-12-28T20:42:02Z (12 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

d18ad61

Parents:

ac36aed (diff), 1df1905 (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:

proactive merge of the LEON3 (SPARCv8) port (originally from lp:~jceel/helenos/leon3)

Note: This is a preliminary merge (proof-of-concept) from the remote branch as of 2013-12-12, after a basic code revision and cleanup. There might be regressions and divergencies from the current state of the remote branch.

File:

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

kernel/genarch/Makefile.inc

@@ -97 +97 @@
 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
 
@@ -108 +108 @@
         GENARCH_SOURCES += \
                 genarch/src/drivers/omap/uart.c
+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