Changeset 3f03199 in mainline for boot/arch


Ignore:
Timestamp:
2013-09-15T06:33:53Z (12 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9348862
Parents:
dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

Location:
boot/arch
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • boot/arch/arm32/Makefile.inc

    rdd7078c r3f03199  
    5757endif
    5858
    59 RD_DRVS += \
     59RD_DRVS_ESSENTIAL += \
    6060        infrastructure/rootamdm37x \
    6161        fb/amdm37x_dispc \

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

    rdd7078c r3f03199  
    207207                 * so this is safe for all archs.
    208208                 * Enable VMSAv6 the bit (23) is only writable on ARMv6.
     209                 * (and QEMU)
    209210                 */
     211#ifdef PROCESSOR_ARCH_armv6
    210212                "ldr r1, =0x00801805\n"
     213#else
     214                "ldr r1, =0x00001805\n"
     215#endif
    211216               
    212217                "orr r0, r0, r1\n"

  • boot/arch/mips32/Makefile.inc

    rdd7078c r3f03199  
    5050endif
    5151
     52ifeq ($(MACHINE), $(filter $(MACHINE),bmalta lmalta))
     53        RD_DRVS_ESSENTIAL += \
     54                infrastructure/rootmalta \
     55                block/ata_bd \
     56                bus/pci/pciintel \
     57                bus/isa \
     58                char/i8042 \
     59                char/ps2mouse \
     60                char/xtkbd
     61
     62        RD_DRV_CFG += \
     63                bus/isa
     64endif
    5265
    5366SOURCES = \

  • boot/arch/ppc32/Makefile.inc

    rdd7078c r3f03199  
    4242        $(USPACE_PATH)/srv/hw/bus/cuda_adb/cuda_adb
    4343
    44 RD_DRVS += \
     44RD_DRVS_ESSENTIAL += \
    4545        infrastructure/rootmac \
    4646        bus/pci/pciintel \

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

    rdd7078c r3f03199  
    3030#include <arch/arch.h>
    3131
     32#if defined(PROCESSOR_us) || defined(PROCESSOR_us3)
    3233#define ICACHE_SIZE       8192
    3334#define ICACHE_LINE_SIZE  32
    3435#define ICACHE_SET_BIT    (1 << 13)
    3536#define ASI_ICACHE_TAG    0x67
     37#endif  /* PROCESSOR_us || PROCESSOR_us3 */
    3638
    3739.register %g2, #scratch
    … …  
    134136# Flush I-cache
    135137icache_flush:
     138#if defined(PROCESSOR_us) || defined(PROCESSOR_us3)
    136139        set ((ICACHE_SIZE - ICACHE_LINE_SIZE) | ICACHE_SET_BIT), %g1
    137140        stxa %g0, [%g1] ASI_ICACHE_TAG
    … …  
    149152       
    150153        nop
     154#else
     155        // TODO: sun4v
     156        retl
     157        nop
     158#endif  /* PROCESSOR_us || PROCESSOR_us3 */
    151159
    152160.global ofw
Note: See TracChangeset for help on using the changeset viewer.