Changes in / [41b735f3:ac36aed] in mainline


Ignore:
Files:
5 added
106 deleted
7 edited

Legend:

Unmodified
Added
Removed

  • HelenOS.config

    r41b735f3 rac36aed  
    3232% Platform
    3333@ "abs32le" abstract 32-bit little endian
    34 @ "amd64" AMD64/EM64T 64-bit (PC)
     34@ "amd64" AMD64/Intel EM64T (PC)
    3535@ "arm32" ARM 32-bit
    36 @ "ia32" IA-32 32-bit (PC)
    37 @ "ia64" IA-64 64-bit
     36@ "ia32" Intel IA-32 (PC)
     37@ "ia64" Intel IA-64
    3838@ "mips32" MIPS 32-bit
    3939@ "mips64" MIPS 64-bit
    40 @ "ppc32" PowerPC 32-bit
    41 @ "sparc32" SPARCv8 32-bit
    42 @ "sparc64" SPARCv9 64-bit
     40@ "ppc32" PowerPC 32-bit (iMac G4)
     41@ "sparc64" Sun UltraSPARC 64-bit
    4342! PLATFORM (choice)
    4443
    … …  
    6160@ "generic" Generic Sun workstation or server
    6261! [PLATFORM=sparc64] MACHINE (choice)
    63 
    64 % Machine type
    65 @ "leon3" Gaisler Aeroflex LEON3
    66 ! [PLATFORM=sparc32] MACHINE (choice)
    6762
    6863% Machine type
    … …  
    8782
    8883% CPU type
    89 @ "leon3" Gaisler Aeroflex LEON3
    90 ! [PLATFORM=sparc32&MACHINE=leon3] PROCESSOR (choice)
    91 
    92 % CPU type
    9384@ "us" UltraSPARC I-II subarchitecture
    9485@ "us3" UltraSPARC III-IV subarchitecture
    … …  
    182173
    183174% Kernel architecture
    184 @ "sparc32"
    185 ! [PLATFORM=sparc32] KARCH (choice)
    186 
    187 % Kernel architecture
    188175@ "sparc64"
    189176! [PLATFORM=sparc64] KARCH (choice)
    … …  
    233220
    234221% User space architecture
    235 @ "sparc32"
    236 ! [PLATFORM=sparc32] UARCH (choice)
    237 
    238 % User space architecture
    239222@ "sparc64"
    240223! [PLATFORM=sparc64] UARCH (choice)
    … …  
    282265@ "ppc64"
    283266! [PLATFORM=ppc64] BARCH (choice)
    284 
    285 % Boot architecture
    286 @ "sparc32"
    287 ! [PLATFORM=sparc32] BARCH (choice)
    288267
    289268% Boot architecture
    … …  
    335314@ "gcc_helenos" GNU C Compiler (experimental HelenOS-specific cross-compiler)
    336315@ "clang" Clang
    337 ! [PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=sparc32|PLATFORM=sparc64] COMPILER (choice)
     316! [PLATFORM=abs32le|PLATFORM=arm32|PLATFORM=sparc64] COMPILER (choice)
    338317
    339318
    … …  
    362341
    363342% Hierarchical page tables support
    364 ! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32|PLATFORM=sparc32] CONFIG_PAGE_PT (y)
     343! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=amd64|PLATFORM=arm32|PLATFORM=mips32|PLATFORM=ppc32] CONFIG_PAGE_PT (y)
    365344
    366345% Page hash table support
    … …  
    368347
    369348% Software integer division support
    370 ! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32|PLATFORM=sparc32] CONFIG_SOFTINT (y)
     349! [PLATFORM=abs32le|PLATFORM=ia32|PLATFORM=arm32|PLATFORM=ia64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32] CONFIG_SOFTINT (y)
    371350
    372351% ASID support
    373 ! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32|PLATFORM=sparc32|PLATFORM=sparc64] CONFIG_ASID (y)
     352! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID (y)
    374353
    375354% ASID FIFO support
    376 ! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32|PLATFORM=sparc32|PLATFORM=sparc64] CONFIG_ASID_FIFO (y)
     355! [PLATFORM=ia64|PLATFORM=mips32|PLATFORM=mips64|PLATFORM=ppc32|PLATFORM=sparc64] CONFIG_ASID_FIFO (y)
    377356
    378357% OpenFirmware tree support
    … …  
    513492! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&PLATFORM=arm32&(MACHINE=beagleboardxm|MACHINE=beaglebone)] CONFIG_OMAP_UART (y/n)
    514493
    515 % Support for GRLIB UART
    516 ! [PLATFORM=sparc32&MACHINE=leon3] CONFIG_GRLIB_UART (y)
    517 
    518 % Support for GRLIB IRQMP
    519 ! [PLATFORM=sparc32&MACHINE=leon3] CONFIG_GRLIB_IRQMP (y)
    520 
    521494% Support for i8042 controller
    522495! [CONFIG_PC_KBD=y] CONFIG_I8042 (y)
    … …  
    538511
    539512% Serial line input module
    540 ! [CONFIG_DSRLNIN=y|(PLATFORM=sparc32)|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_ARM926_UART=y)|(PLATFORM=arm32&MACHINE=beaglebone&CONFIG_OMAP_UART=y)|(PLATFORM=arm32&MACHINE=beagleboardxm&CONFIG_OMAP_UART=y)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)] CONFIG_SRLN (y)
     513! [CONFIG_DSRLNIN=y|(PLATFORM=arm32&MACHINE=gta02)|(PLATFORM=arm32&MACHINE=integratorcp&CONFIG_ARM926_UART=y)|(PLATFORM=arm32&MACHINE=beaglebone&CONFIG_OMAP_UART=y)|(PLATFORM=arm32&MACHINE=beagleboardxm&CONFIG_OMAP_UART=y)|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&PROCESSOR=sun4v)] CONFIG_SRLN (y)
    541514
    542515% EGA support
    … …  
    653626@ "5" Linux kernel
    654627! [PLATFORM=arm32&MACHINE!=beagleboardxm&MACHINE!=beaglebone] UIMAGE_OS (choice)
    655 
    656 % uImage OS type
    657 @ "5" Linux kernel
    658 ! [PLATFORM=sparc32] UIMAGE_OS (choice)

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

    r41b735f3 rac36aed  
    4141#include <genarch/fb/fb.h>
    4242#include <abi/fb/visuals.h>
    43 #include <genarch/drivers/s3c24xx/uart.h>
    44 #include <genarch/drivers/s3c24xx/irqc.h>
    45 #include <genarch/drivers/s3c24xx/timer.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>
    4646#include <genarch/srln/srln.h>
    4747#include <sysinfo/sysinfo.h>

  • kernel/genarch/Makefile.inc

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

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

    r41b735f3 rac36aed  
    517517       
    518518#ifdef SCHEDULER_VERBOSE
    519         printf("cpu%u: tid %" PRIu64 " (priority=%d, ticks=%" PRIu64
    520             ", nrdy=%" PRIua ")\n", CPU->id, THREAD->tid, THREAD->priority,
     519        printf("cpu%u: tid %" PRIu64 " (priority=%d, ticks=%" PRIu64 
     520            ", nrdy=%ld)\n", CPU->id, THREAD->tid, THREAD->priority,
    521521            THREAD->ticks, atomic_get(&CPU->nrdy));
    522522#endif

  • tools/autotool.py

    r41b735f3 rac36aed  
    263263                clang_target = "powerpc-unknown-linux"
    264264                helenos_target = "ppc-helenos"
    265        
    266         if (config['PLATFORM'] == "sparc32"):
    267                 target = config['PLATFORM'];
    268                 gnu_target = "sparc-leon3-linux-gnu"
    269                 helenos_target = "sparc-leon3-helenos"
    270265       
    271266        if (config['PLATFORM'] == "sparc64"):

  • tools/toolchain.sh

    r41b735f3 rac36aed  
    155155        echo " ppc32      32-bit PowerPC"
    156156        echo " ppc64      64-bit PowerPC"
    157         echo " sparc32    SPARC V8"
    158157        echo " sparc64    SPARC V9"
    159158        echo " all        build all targets"
    … …  
    379378                        HELENOS_TARGET="ppc64-helenos"
    380379                        ;;
    381                 "sparc32")
    382                         LINUX_TARGET="sparc-leon3-linux-gnu"
    383                         HELENOS_TARGET="sparc-leon3-helenos"
    384                         ;;
    385380                "sparc64")
    386381                        LINUX_TARGET="sparc64-linux-gnu"
    … …  
    560555
    561556case "$1" in
    562         amd64|arm32|ia32|ia64|mips32|mips32eb|mips64|ppc32|ppc64|sparc32|sparc64)
     557        amd64|arm32|ia32|ia64|mips32|mips32eb|mips64|ppc32|ppc64|sparc64)
    563558                prepare
    564559                build_target "$1"
    … …  
    575570                build_target "ppc32"
    576571                build_target "ppc64"
    577                 build_target "sparc32"
    578572                build_target "sparc64"
    579573                ;;
    … …  
    589583                build_target "ppc32" &
    590584                build_target "ppc64" &
    591                 build_target "sparc32" &
    592585                build_target "sparc64" &
    593586                wait
    … …  
    612605               
    613606                build_target "ppc64" &
    614                 build_target "sparc32" &
    615                 wait
    616                
    617607                build_target "sparc64" &
    618608                wait

  • uspace/lib/c/arch/abs32le/include/libarch/atomic.h

    r41b735f3 rac36aed  
    5353}
    5454
    55 static inline void atomic_inc(atomic_t *val)
    56 {
     55static inline void atomic_inc(atomic_t *val) {
    5756        /* On real hardware the increment has to be done
    5857           as an atomic action. */
    … …  
    6160}
    6261
    63 static inline void atomic_dec(atomic_t *val)
    64 {
     62static inline void atomic_dec(atomic_t *val) {
    6563        /* On real hardware the decrement has to be done
    6664           as an atomic action. */
Note: See TracChangeset for help on using the changeset viewer.