Changeset 6843a9c in mainline for boot/arch


Ignore:
Timestamp:
2012-06-29T13:02:14Z (14 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
722912e
Parents:
ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

Location:
boot/arch
Files:
1 added
11 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/amd64/Makefile.inc

    rba72f2b r6843a9c  
    2727#
    2828
    29 PAGE_SIZE = 4096
    30 
    3129RD_SRVS_ESSENTIAL += \
    32         $(USPACE_PATH)/srv/hw/char/i8042/i8042 \
    3330        $(USPACE_PATH)/srv/hw/irc/apic/apic \
    3431        $(USPACE_PATH)/srv/hw/irc/i8259/i8259
    … …  
    4340        bus/pci/pciintel \
    4441        bus/isa \
     42        char/i8042 \
     43        char/ns8250 \
     44        char/ps2mouse \
     45        char/xtkbd \
    4546        bus/usb/ehci\
    4647        bus/usb/ohci \

  • boot/arch/arm32/Makefile.inc

    rba72f2b r6843a9c  
    3939BITS = 32
    4040ENDIANESS = LE
    41 PAGE_SIZE = 4096
     41EXTRA_CFLAGS = -march=armv4
    4242
    4343RD_SRVS_ESSENTIAL += \
    44         $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24ts \
    45         $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser
     44        $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24xx_ts \
     45        $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24xx_uart
    4646
    4747RD_SRVS_NON_ESSENTIAL += \
    … …  
    5050SOURCES = \
    5151        arch/$(BARCH)/src/asm.S \
     52        arch/$(BARCH)/src/eabi.S \
    5253        arch/$(BARCH)/src/main.c \
    5354        arch/$(BARCH)/src/mm.c \

  • boot/arch/arm32/src/asm.S

    rba72f2b r6843a9c  
    6060        # before passing control to the copied code.
    6161        #
    62         bx r0
     62        mov pc, r0

  • boot/arch/ia64/Makefile.inc

    rba72f2b r6843a9c  
    3333BITS = 64
    3434ENDIANESS = LE
    35 PAGE_SIZE = 16384
    3635EXTRA_CFLAGS = -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -mno-sdata
    3736
    3837RD_SRVS_NON_ESSENTIAL +=
    3938
    40 RD_SRVS_ESSENTIAL += \
    41         $(USPACE_PATH)/srv/hw/char/i8042/i8042
     39RD_SRVS_ESSENTIAL +=
    4240
    4341SOURCES = \

  • boot/arch/ia64/src/main.c

    rba72f2b r6843a9c  
    189189        printf("\nInflating components ... ");
    190190       
     191        /*
     192         * We will use the next available address for a copy of each component to
     193         * make sure that inflate() works with disjunctive memory regions.
     194         */
     195        top = ALIGN_UP(top, PAGE_SIZE);
     196
    191197        for (i = cnt; i > 0; i--) {
    192198                printf("%s ", components[i - 1].name);
    193199               
    194                 int err = inflate(components[i - 1].start, components[i - 1].size,
     200                /*
     201                 * Copy the component to a location which is guaranteed not to
     202                 * overlap with the destination for inflate().
     203                 */
     204                memmove((void *) top, components[i - 1].start, components[i - 1].size);
     205               
     206                int err = inflate((void *) top, components[i - 1].size,
    195207                    dest[i - 1], components[i - 1].inflated);
    196208               

  • boot/arch/ia64/src/pal_asm.S

    rba72f2b r6843a9c  
    3232
    3333pal_static_call:
    34         alloc loc0 = ar.pfs, 7, 5, 0, 0
     34        alloc loc0 = ar.pfs, 7, 6, 0, 0
     35
     36        mov loc1 = psr ;;
     37        mov psr.l = r0 ;;
     38        srlz.i
     39        srlz.d
    3540       
    36         mov loc1 = gp
    37         mov loc2 = rp
     41        mov loc2 = gp
     42        mov loc3 = rp
    3843       
    39         addl loc3 = @gprel(pal_proc), gp
    40        
     44        addl loc4 = @gprel(pal_proc), gp
     45
    4146        mov r28 = in0
    4247        mov r29 = in1
    … …  
    4449        mov r31 = in3 ;;
    4550       
    46         ld8 loc3 = [loc3]
    47         movl loc4 = 0f ;;
     51        ld8 loc4 = [loc4]
     52        movl loc5 = 0f ;;
    4853
    49         mov b6 = loc3
    50         mov rp = loc4 ;;
     54        mov b6 = loc4
     55        mov rp = loc5 ;;
    5156        br.cond.sptk.many b6
    5257
    53580:
     59        mov psr.l = loc1 ;;
     60        srlz.i
     61        srlz.d
     62
    5463        cmp.ne p7,p0 = 0, in4
    5564        cmp.ne p8,p0 = 0, in5
    … …  
    6069(p9)    st8 [in6] = r11
    6170       
    62         mov gp = loc1
    63         mov rp = loc2 ;;
     71        mov gp = loc2
     72        mov rp = loc3 ;;
    6473       
    6574        mov ar.pfs = loc0

  • boot/arch/ia64/src/sal_asm.S

    rba72f2b r6843a9c  
    2929.explicit
    3030
     31#define STACK_SCRATCH_AREA      16
     32#define STACK_IN8               (0 + STACK_SCRATCH_AREA)
     33#define STACK_IN9               (8 + STACK_SCRATCH_AREA)
     34#define STACK_IN10              (16 + STACK_SCRATCH_AREA)
     35
    3136.global sal_call
    3237
    … …  
    3944#
    4045sal_call:
    41         alloc loc0 = ar.pfs, 11, 5, 8, 0
     46        alloc loc0 = ar.pfs, 8, 8, 8, 0
    4247       
     48        adds sp = -STACK_SCRATCH_AREA, sp
     49
    4350        mov loc1 = gp
    4451        mov loc2 = rp
    … …  
    5764       
    5865        ld8 loc3 = [loc3]
    59         ld8 gp = [loc4] ;;
     66        ld8 gp = [loc4]
     67
     68        adds r14 = STACK_IN8 + STACK_SCRATCH_AREA, sp
     69        adds r15 = STACK_IN9 + STACK_SCRATCH_AREA, sp
     70        adds r16 = STACK_IN10 + STACK_SCRATCH_AREA, sp ;;
     71
     72        ld8 loc5 = [r14]
     73        ld8 loc6 = [r15]
     74        ld8 loc7 = [r16]
    6075       
    6176        mov b6 = loc3 ;;
    6277        br.call.sptk.many rp = b6
    6378       
    64         cmp.ne p7,p0 = 0, in8
    65         cmp.ne p8,p0 = 0, in9
    66         cmp.ne p9,p0 = 0, in10 ;;
     79        cmp.ne p7,p0 = 0, loc5
     80        cmp.ne p8,p0 = 0, loc6
     81        cmp.ne p9,p0 = 0, loc7 ;;
    6782       
    68 (p7)    st8 [in8] = r9
    69 (p8)    st8 [in9] = r10
    70 (p9)    st8 [in10] = r11
     83(p7)    st8 [loc5] = r9
     84(p8)    st8 [loc6] = r10
     85(p9)    st8 [loc7] = r11
    7186       
    7287        mov gp = loc1
    73         mov rp = loc2 ;;
     88        mov rp = loc2
     89
     90        adds sp = STACK_SCRATCH_AREA, sp ;;
    7491       
    7592        mov ar.pfs = loc0
    7693        br.ret.sptk.many rp
     94

  • boot/arch/mips32/Makefile.inc

    rba72f2b r6843a9c  
    2929BFD_ARCH = mips
    3030BITS = 32
    31 PAGE_SIZE = 16384
    3231EXTRA_CFLAGS = -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=32
    3332

  • boot/arch/mips64/Makefile.inc

    rba72f2b r6843a9c  
    2929BFD_ARCH = mips:4000
    3030BITS = 64
    31 PAGE_SIZE = 16384
    3231EXTRA_CFLAGS = -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3 -mabi=64
    3332

  • boot/arch/ppc32/Makefile.inc

    rba72f2b r6843a9c  
    3737BITS = 32
    3838ENDIANESS = BE
    39 PAGE_SIZE = 4096
    4039EXTRA_CFLAGS = -mcpu=powerpc -msoft-float -m32
    4140

  • boot/arch/sparc64/Makefile.inc

    rba72f2b r6843a9c  
    3737BITS = 64
    3838ENDIANESS = BE
    39 PAGE_SIZE = 16384
    4039EXTRA_CFLAGS = -mcpu=ultrasparc -m64 -mno-fpu -mcmodel=medlow
    4140
Note: See TracChangeset for help on using the changeset viewer.