Changeset 41b735f3 in mainline for kernel


Ignore:
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.

Location:
kernel
Files:
58 added
3 edited
5 moved

Legend:

Unmodified
Added
Removed

  • kernel/arch/arm32/src/mach/gta02/gta02.c

    rac36aed r41b735f3  
    4141#include <genarch/fb/fb.h>
    4242#include <abi/fb/visuals.h>
    43 #include <genarch/drivers/s3c24xx_uart/s3c24xx_uart.h>
    44 #include <genarch/drivers/s3c24xx_irqc/s3c24xx_irqc.h>
    45 #include <genarch/drivers/s3c24xx_timer/s3c24xx_timer.h>
     43#include <genarch/drivers/s3c24xx/uart.h>
     44#include <genarch/drivers/s3c24xx/irqc.h>
     45#include <genarch/drivers/s3c24xx/timer.h>
    4646#include <genarch/srln/srln.h>
    4747#include <sysinfo/sysinfo.h>

  • kernel/genarch/Makefile.inc

    rac36aed r41b735f3  
    9797ifeq ($(CONFIG_S3C24XX_IRQC),y)
    9898        GENARCH_SOURCES += \
    99                 genarch/src/drivers/s3c24xx_irqc/s3c24xx_irqc.c
     99                genarch/src/drivers/s3c24xx/irqc.c
    100100endif
    101101
    102102ifeq ($(CONFIG_S3C24XX_UART),y)
    103103        GENARCH_SOURCES += \
    104                 genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c
     104                genarch/src/drivers/s3c24xx/uart.c
    105105endif
    106106
    … …  
    108108        GENARCH_SOURCES += \
    109109                genarch/src/drivers/omap/uart.c
     110endif
     111
     112ifeq ($(CONFIG_GRLIB_UART),y)
     113        GENARCH_SOURCES += \
     114                genarch/src/drivers/grlib/uart.c
     115endif
     116
     117ifeq ($(CONFIG_GRLIB_IRQMP),y)
     118        GENARCH_SOURCES += \
     119                genarch/src/drivers/grlib/irqmp.c
    110120endif
    111121

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

    rac36aed r41b735f3  
    3737 */
    3838
    39 #include <genarch/drivers/s3c24xx_irqc/s3c24xx_irqc.h>
     39#include <genarch/drivers/s3c24xx/irqc.h>
    4040#include <arch/asm.h>
    4141

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

    rac36aed r41b735f3  
    3838 */
    3939
    40 #include <genarch/drivers/s3c24xx_uart/s3c24xx_uart.h>
     40#include <genarch/drivers/s3c24xx/uart.h>
    4141#include <console/chardev.h>
    4242#include <console/console.h>

  • kernel/generic/src/proc/scheduler.c

    rac36aed r41b735f3  
    517517       
    518518#ifdef SCHEDULER_VERBOSE
    519         printf("cpu%u: tid %" PRIu64 " (priority=%d, ticks=%" PRIu64 
    520             ", nrdy=%ld)\n", CPU->id, THREAD->tid, THREAD->priority,
     519        printf("cpu%u: tid %" PRIu64 " (priority=%d, ticks=%" PRIu64
     520            ", nrdy=%" PRIua ")\n", CPU->id, THREAD->tid, THREAD->priority,
    521521            THREAD->ticks, atomic_get(&CPU->nrdy));
    522522#endif
Note: See TracChangeset for help on using the changeset viewer.