Changeset 4c14b88 in mainline for kernel/genarch

Timestamp:

2013-12-31T07:57:14Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1b973dc

Parents:

6297465 (diff), 208b5f5 (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

Location:

kernel/genarch

Files:

• Makefile.inc (modified) (2 diffs)
• include/genarch/drivers/grlib/irqmp.h (added)
• include/genarch/drivers/grlib/timer.h (added)
• include/genarch/drivers/grlib/uart.h (added)
• include/genarch/drivers/s3c24xx/irqc.h (moved) (moved from kernel/genarch/include/genarch/drivers/s3c24xx_irqc/s3c24xx_irqc.h )
• include/genarch/drivers/s3c24xx/timer.h (moved) (moved from kernel/genarch/include/genarch/drivers/s3c24xx_timer/s3c24xx_timer.h )
• include/genarch/drivers/s3c24xx/uart.h (moved) (moved from kernel/genarch/include/genarch/drivers/s3c24xx_uart/s3c24xx_uart.h )
• src/drivers/grlib/irqmp.c (added)
• src/drivers/grlib/uart.c (added)
• src/drivers/s3c24xx/irqc.c (moved) (moved from kernel/genarch/src/drivers/s3c24xx_irqc/s3c24xx_irqc.c ) (1 diff)
• src/drivers/s3c24xx/uart.c (moved) (moved from kernel/genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c ) (1 diff)

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
 

kernel/genarch/src/drivers/s3c24xx/irqc.c

@@ -37 +37 @@
  */
 
-#include <genarch/drivers/s3c24xx_irqc/s3c24xx_irqc.h>
+#include <genarch/drivers/s3c24xx/irqc.h>
 #include <arch/asm.h>
 

kernel/genarch/src/drivers/s3c24xx/uart.c

@@ -38 +38 @@
  */
 
-#include <genarch/drivers/s3c24xx_uart/s3c24xx_uart.h>
+#include <genarch/drivers/s3c24xx/uart.h>
 #include <console/chardev.h>
 #include <console/console.h>