Changeset 03362fbd in mainline for kernel/genarch/Makefile.inc

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

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

kernel/genarch/Makefile.inc

@@ -91 +91 @@
 endif
 
+ifeq ($(CONFIG_ARM926_UART),y)
+        GENARCH_SOURCES += \
+                genarch/src/drivers/arm926_uart/arm926_uart.c
+endif
+
 ifeq ($(CONFIG_S3C24XX_IRQC),y)
         GENARCH_SOURCES += \
@@ -99 +104 @@
         GENARCH_SOURCES += \
                 genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c
+endif
+
+ifeq ($(CONFIG_AMDM37X_UART),y)
+        GENARCH_SOURCES += \
+                genarch/src/drivers/amdm37x_uart/amdm37x_uart.c
 endif