Changeset 8e7c9fe in mainline for boot/arch


Ignore:
Timestamp:
2014-09-12T03:45:25Z (11 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c53b58e
Parents:
3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

Location:
boot/arch
Files:
10 deleted
6 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/amd64/Makefile.inc

    r3eb0c85 r8e7c9fe  
    3535
    3636RD_DRVS_ESSENTIAL += \
    37         infrastructure/rootpc \
     37        platform/pc \
    3838        block/ata_bd \
    3939        bus/pci/pciintel \
    … …  
    4545
    4646RD_DRVS_NON_ESSENTIAL += \
     47        audio/hdaudio \
    4748        char/ns8250 \
    4849        time/cmos-rtc \
    … …  
    6364        $(USPACE_PATH)/app/edit/edit \
    6465        $(USPACE_PATH)/app/mixerctl/mixerctl \
    65         $(USPACE_PATH)/app/wavplay/wavplay \
    66        
     66        $(USPACE_PATH)/app/wavplay/wavplay
     67
    6768BOOT_OUTPUT = $(ROOT_PATH)/image.iso
    6869PREBUILD = $(INITRD).img

  • boot/arch/arm32/Makefile.inc

    r3eb0c85 r8e7c9fe  
    6060
    6161ifeq ($(MACHINE), gta02)
    62 RD_SRVS_ESSENTIAL += \
    63         $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24xx_ts \
    64         $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser
     62        RD_SRVS_ESSENTIAL += \
     63                $(USPACE_PATH)/srv/hid/s3c24xx_ts/s3c24xx_ts \
     64                $(USPACE_PATH)/srv/hw/char/s3c24xx_uart/s3c24ser
     65endif
     66
     67ifeq ($(MACHINE), $(filter $(MACHINE),beagleboardxm beaglebone))
     68        RD_DRVS_ESSENTIAL += \
     69                platform/amdm37x \
     70                fb/amdm37x_dispc
     71endif
     72
     73ifeq ($(MACHINE), integratorcp)
     74        RD_DRVS_ESSENTIAL += \
     75                char/pl050 \
     76                char/xtkbd \
     77                char/ps2mouse \
     78                platform/icp
     79        RD_SRVS_ESSENTIAL += \
     80                $(USPACE_PATH)/srv/hw/irc/icp-ic/icp-ic
    6581endif
    6682
    6783RD_DRVS_ESSENTIAL += \
    68         infrastructure/rootamdm37x \
    69         fb/amdm37x_dispc \
    7084        bus/usb/ehci \
    7185        bus/usb/ohci \

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

    r3eb0c85 r8e7c9fe  
    129129       
    130130        printf(".\n");
     131
     132        /* Flush PT too. We need this if we disable caches later */
     133        clean_dcache_poc(boot_pt, PTL0_ENTRIES * PTL0_ENTRY_SIZE);
    131134       
    132135        printf("Booting the kernel...\n");

  • boot/arch/ia64/Makefile.inc

    r3eb0c85 r8e7c9fe  
    3131BFD_ARCH = ia64
    3232
    33 #
    34 # FIXME:
    35 #
    36 # The -fno-selective-scheduling and -fno-selective-scheduling2 options
    37 # should be removed as soon as a bug in GCC concerning unchecked
    38 # speculative loads is fixed.
    39 #
    40 # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53975 for reference.
    41 #
    42 
    4333BITS = 64
    4434ENDIANESS = LE
    45 EXTRA_CFLAGS = -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -mno-sdata -fno-selective-scheduling -fno-selective-scheduling2
     35EXTRA_CFLAGS = -fno-unwind-tables -mfixed-range=f32-f127 -mno-pic -mno-sdata
    4636
    4737RD_SRVS_NON_ESSENTIAL +=
    … …  
    7464        arch/$(BARCH)/src/ski.c
    7565endif
     66
     67RD_DRVS_ESSENTIAL += \
     68        platform/pc \
     69        bus/pci/pciintel \
     70        bus/isa \
     71        char/i8042 \
     72        char/xtkbd
     73
     74RD_DRVS_NON_ESSENTIAL += \
     75        char/ns8250 \
     76        time/cmos-rtc \
     77        bus/usb/ehci\
     78        bus/usb/ohci \
     79        bus/usb/uhci \
     80        bus/usb/uhcirh \
     81        bus/usb/usbflbk \
     82        bus/usb/usbhub \
     83        bus/usb/usbhid \
     84        bus/usb/usbmast \
     85        bus/usb/usbmid \
     86        bus/usb/vhc
     87
     88RD_DRV_CFG += \
     89        bus/isa
     90

  • boot/arch/mips32/Makefile.inc

    r3eb0c85 r8e7c9fe  
    5252ifeq ($(MACHINE), $(filter $(MACHINE),bmalta lmalta))
    5353        RD_DRVS_ESSENTIAL += \
    54                 infrastructure/rootmalta \
     54                platform/malta \
    5555                block/ata_bd \
    5656                bus/pci/pciintel \

  • boot/arch/ppc32/Makefile.inc

    r3eb0c85 r8e7c9fe  
    4343
    4444RD_DRVS_ESSENTIAL += \
    45         infrastructure/rootmac \
     45        platform/mac \
    4646        bus/pci/pciintel \
    4747        bus/usb/ohci \
Note: See TracChangeset for help on using the changeset viewer.