Changeset f9d0a86 in mainline for boot/arch


Ignore:
Timestamp:
2017-11-14T12:24:42Z (8 years ago)
Author:
Aearsis <Hlavaty.Ondrej@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
6cad776
Parents:
887c9de (diff), d2d142a (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.
git-author:
Aearsis <Hlavaty.Ondrej@…> (2017-11-14 01:04:19)
git-committer:
Aearsis <Hlavaty.Ondrej@…> (2017-11-14 12:24:42)
Message:

Merge tag '0.7.1'

The merge wasn't clean, because of changes in build system. The most
significant change was partial revert of usbhc callback refactoring,
which now does not take usb transfer batch, but few named fields again.

Location:
boot/arch
Files:
1 added
1 deleted
7 edited
34 moved

Legend:

Unmodified
Added
Removed

  • boot/arch/amd64/Makefile.inc

    r887c9de rf9d0a86  
    3939        audio/sb16 \
    4040        char/i8042 \
    41         char/ps2mouse \
    42         char/xtkbd
     41        hid/ps2mouse \
     42        hid/xtkbd
    4343
    4444RD_DRVS_NON_ESSENTIAL += \
    … …  
    5151        bus/usb/usbflbk \
    5252        bus/usb/usbhub \
    53         bus/usb/usbhid \
    54         bus/usb/usbmast \
    5553        bus/usb/usbmid \
    5654        bus/usb/vhc \
    57         bus/usb/xhci
     55        bus/usb/xhci \
     56        block/usbmast \
     57        hid/usbhid
    5858
    5959RD_DRV_CFG += \

  • boot/arch/arm32/Makefile.inc

    r887c9de rf9d0a86  
    7474        RD_DRVS_ESSENTIAL += \
    7575                char/pl050 \
    76                 char/atkbd \
    77                 char/ps2mouse \
     76                hid/atkbd \
     77                hid/ps2mouse \
    7878                intctl/icp-ic \
    7979                platform/icp
    … …  
    8585        bus/usb/usbflbk \
    8686        bus/usb/usbhub \
    87         bus/usb/usbhid \
    88         bus/usb/usbmast \
    89         bus/usb/usbmid
     87        bus/usb/usbmid \
     88        block/usbmast \
     89        hid/usbhid
    9090
    9191SOURCES = \

  • boot/arch/arm32/include/arch/types.h

    r887c9de rf9d0a86  
    3737#define BOOT_arm32_TYPES_H
    3838
    39 #include <arch/common.h>
     39#include <_bits/all.h>
    4040
    4141#define TASKMAP_MAX_RECORDS        32
    4242#define BOOTINFO_TASK_NAME_BUFLEN  32
    43 
    44 typedef uint32_t size_t;
    45 typedef uint32_t uintptr_t;
    46 
    47 typedef uint32_t pfn_t;
    48 
    49 typedef int32_t ptrdiff_t;
    5043
    5144typedef struct {

  • boot/arch/ia64/Makefile.inc

    r887c9de rf9d0a86  
    6666endif
    6767
     68ifeq ($(MACHINE),i460GX)
    6869RD_DRVS_ESSENTIAL += \
    6970        platform/pc \
    … …  
    7172        bus/isa \
    7273        char/i8042 \
    73         char/xtkbd
     74        hid/xtkbd
    7475
    7576RD_DRVS_NON_ESSENTIAL += \
    … …  
    8182        bus/usb/usbflbk \
    8283        bus/usb/usbhub \
    83         bus/usb/usbhid \
    84         bus/usb/usbmast \
    8584        bus/usb/usbmid \
    86         bus/usb/vhc
     85        bus/usb/vhc \
     86        block/usbmast \
     87        hid/usbhid
    8788
    8889RD_DRV_CFG += \
    8990        bus/isa
     91endif
     92
     93ifeq ($(MACHINE),ski)
     94RD_DRVS_ESSENTIAL += \
     95        char/ski-con \
     96        platform/ski
     97endif
    9098
    9199PRE_DEPEND = $(COMPS).s $(COMPS).h $(COMPS)_desc.c $(COMPONENTS_DEFLATE)

  • boot/arch/ia64/include/arch/types.h

    r887c9de rf9d0a86  
    3030#define BOOT_ia64_TYPES_H_
    3131
    32 #include <arch/common.h>
     32#include <_bits/all.h>
    3333
    3434#define TASKMAP_MAX_RECORDS             32
    3535#define BOOTINFO_TASK_NAME_BUFLEN       32
    3636#define MEMMAP_ITEMS                    128
    37 
    38 typedef uint64_t size_t;
    39 typedef uint64_t sysarg_t;
    40 typedef uint64_t uintptr_t;
    41 
    42 typedef int64_t ptrdiff_t;
    4337
    4438typedef struct {

  • boot/arch/mips32/Makefile.inc

    r887c9de rf9d0a86  
    5858                bus/isa \
    5959                char/i8042 \
    60                 char/ps2mouse \
    61                 char/xtkbd
     60                hid/ps2mouse \
     61                hid/xtkbd
    6262
    6363        RD_DRV_CFG += \
    … …  
    6868        RD_DRVS_ESSENTIAL += \
    6969                platform/msim \
    70                 block/ddisk
     70                block/ddisk \
     71                char/msim-con
    7172endif
    7273

  • boot/arch/mips32/include/arch/types.h

    r887c9de rf9d0a86  
    3030#define BOOT_mips32_TYPES_H_
    3131
    32 #include <arch/common.h>
     32#include <_bits/all.h>
    3333
    3434#define TASKMAP_MAX_RECORDS        32
    3535#define CPUMAP_MAX_RECORDS         32
    3636#define BOOTINFO_TASK_NAME_BUFLEN  32
    37 
    38 typedef uint32_t size_t;
    39 typedef uint32_t uintptr_t;
    40 
    41 typedef int32_t ptrdiff_t;
    4237
    4338typedef struct {

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

    r887c9de rf9d0a86  
    3333.set noat
    3434.set noreorder
    35 .set nomacro
    3635
    3736.section BOOTSTRAP

  • boot/arch/ppc32/Makefile.inc

    r887c9de rf9d0a86  
    4949        bus/usb/usbflbk \
    5050        bus/usb/usbhub \
    51         bus/usb/usbhid \
    52         bus/usb/usbmast \
    5351        bus/usb/usbmid \
    54         bus/usb/vhc
     52        bus/usb/vhc \
     53        block/usbmast \
     54        hid/usbhid
    5555
    5656SOURCES = \

  • boot/arch/ppc32/include/arch/types.h

    r887c9de rf9d0a86  
    3030#define BOOT_ppc32_TYPES_H_
    3131
    32 #include <arch/common.h>
     32#include <_bits/all.h>
    3333
    3434#define TASKMAP_MAX_RECORDS        32
    3535#define BOOTINFO_TASK_NAME_BUFLEN  32
    36 
    37 typedef uint32_t size_t;
    38 typedef uint32_t uintptr_t;
    39 typedef uint32_t sysarg_t;
    40 typedef int32_t native_t;
    41 
    42 typedef int32_t ptrdiff_t;
    4336
    4437typedef struct {

  • boot/arch/riscv64/include/arch/types.h

    r887c9de rf9d0a86  
    3030#define BOOT_riscv64_TYPES_H_
    3131
    32 #include <arch/common.h>
     32#include <_bits/all.h>
    3333
    3434#define MEMMAP_MAX_RECORDS         32
    3535#define TASKMAP_MAX_RECORDS        32
    3636#define BOOTINFO_TASK_NAME_BUFLEN  32
    37 
    38 typedef uint64_t size_t;
    39 typedef uint64_t uintptr_t;
    40 
    41 typedef int64_t ptrdiff_t;
    4237
    4338typedef struct {

  • boot/arch/sparc64/Makefile.inc

    r887c9de rf9d0a86  
    3939EXTRA_CFLAGS = -mcpu=ultrasparc -m64 -mno-fpu -mcmodel=medlow
    4040
     41ifeq ($(PROCESSOR), sun4v)
     42RD_DRVS_ESSENTIAL += \
     43        platform/sun4v \
     44        char/sun4v-con
     45else
    4146RD_DRVS_ESSENTIAL += \
    4247        platform/sun4u \
    4348        bus/pci/pciintel \
    4449        bus/isa \
     50        intctl/obio \
    4551        char/ns8250
    4652
    4753RD_DRV_CFG += \
    4854        bus/isa
    49 
    50 RD_SRVS_NON_ESSENTIAL +=
    51 
    52 RD_SRVS_ESSENTIAL += \
    53         $(USPACE_PATH)/srv/hw/irc/obio/obio
     55endif
    5456
    5557SOURCES = \

  • boot/arch/sparc64/include/arch/types.h

    r887c9de rf9d0a86  
    3030#define BOOT_sparc64_TYPES_H_
    3131
    32 #include <arch/common.h>
     32#include <_bits/all.h>
    3333
    3434#define TASKMAP_MAX_RECORDS        32
    3535#define BOOTINFO_TASK_NAME_BUFLEN  32
    36 
    37 typedef uint64_t size_t;
    38 typedef uint64_t uintptr_t;
    39 typedef uint64_t sysarg_t;
    40 typedef int64_t native_t;
    41 
    42 typedef int64_t ptrdiff_t;
    4336
    4437typedef struct {
Note: See TracChangeset for help on using the changeset viewer.