Changeset 140c211 in rtems


Ignore:
Timestamp:
Apr 2, 2012, 12:09:05 PM (8 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Children:
02c3f4d7
Parents:
74af8c0 (diff), ba56882 (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 branch 'upstream'

Location:
c/src/lib/libbsp/powerpc
Files:
1 deleted
7 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/powerpc/gen83xx/preinstall.am

    r74af8c0 r140c211  
    5454PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/bootcard.h
    5555
     56$(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
     57        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
     58PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
     59
     60$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
     61        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
     62PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
     63
     64$(PROJECT_INCLUDE)/bsp/u-boot.h: ../../shared/include/u-boot.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
     65        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot.h
     66PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot.h
     67
     68$(PROJECT_INCLUDE)/bsp/utility.h: ../../shared/include/utility.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
     69        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/utility.h
     70PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/utility.h
     71
     72$(PROJECT_INCLUDE)/bsp/tictac.h: ../shared/include/tictac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
     73        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tictac.h
     74PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tictac.h
     75
     76$(PROJECT_INCLUDE)/bsp/u-boot-board-info.h: ../shared/include/u-boot-board-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
     77        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot-board-info.h
     78PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot-board-info.h
     79
     80$(PROJECT_INCLUDE)/bsp/hwreg_vals.h: include/hwreg_vals.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
     81        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/hwreg_vals.h
     82PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/hwreg_vals.h
     83
     84$(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
     85        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
     86PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
     87
     88$(PROJECT_INCLUDE)/bsp/tsec-config.h: include/tsec-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
     89        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tsec-config.h
     90PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tsec-config.h
     91
     92$(PROJECT_INCLUDE)/bsp/u-boot-config.h: include/u-boot-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
     93        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot-config.h
     94PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot-config.h
     95
    5696$(PROJECT_INCLUDE)/coverhd.h: ../../shared/include/coverhd.h $(PROJECT_INCLUDE)/$(dirstamp)
    5797        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/coverhd.h
     
    94134PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.hsc_cm01
    95135
    96 $(PROJECT_INCLUDE)/bsp/irq.h: include/irq.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
    97         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq.h
    98 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq.h
    99 
    100 $(PROJECT_INCLUDE)/bsp/irq-generic.h: ../../shared/include/irq-generic.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
    101         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-generic.h
    102 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
    103 
    104 $(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
    105         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
    106 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
    107 
    108 $(PROJECT_INCLUDE)/bsp/u-boot.h: ../../shared/include/u-boot.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
    109         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot.h
    110 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot.h
    111 
    112 $(PROJECT_INCLUDE)/bsp/u-boot-board-info.h: ../shared/include/u-boot-board-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
    113         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot-board-info.h
    114 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot-board-info.h
    115 
    116 $(PROJECT_INCLUDE)/bsp/tictac.h: ../shared/include/tictac.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
    117         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tictac.h
    118 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tictac.h
    119 
    120 $(PROJECT_INCLUDE)/bsp/hwreg_vals.h: include/hwreg_vals.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
    121         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/hwreg_vals.h
    122 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/hwreg_vals.h
    123 
    124 $(PROJECT_INCLUDE)/bsp/tsec-config.h: include/tsec-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
    125         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/tsec-config.h
    126 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/tsec-config.h
    127 
    128 $(PROJECT_INCLUDE)/bsp/u-boot-config.h: include/u-boot-config.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
    129         $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/u-boot-config.h
    130 PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/u-boot-config.h
    131 
  • c/src/lib/libbsp/powerpc/gen83xx/startup/bspstart.c

    r74af8c0 r140c211  
    124124
    125125  /* Initialize some console parameters */
    126   for (i = 0; i < Console_Port_Count; ++i) {
     126  for (i = 0; i < Console_Configuration_Count; ++i) {
    127127    Console_Configuration_Ports [i].ulClock = BSP_bus_frequency;
    128128
  • c/src/lib/libbsp/powerpc/qemuppc/Makefile.am

    r74af8c0 r140c211  
    4646# irq
    4747include_bsp_HEADERS = irq/irq.h \
    48     ../../shared/include/irq-generic.h
     48    ../../shared/include/irq-generic.h \
     49    ../../shared/include/irq-info.h
    4950irq_SOURCES =
    5051irq_SOURCES += ../../shared/src/irq-default-handler.c
  • c/src/lib/libbsp/powerpc/qemuppc/preinstall.am

    r74af8c0 r140c211  
    7878PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
    7979
     80$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
     81        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
     82PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
     83
  • c/src/lib/libbsp/powerpc/shared/clock/clock.c

    r74af8c0 r140c211  
    117117        /* Acknowledge decrementer request */
    118118        PPC_SET_SPECIAL_PURPOSE_REGISTER( BOOKE_TSR, BOOKE_TSR_DIS);
    119 
    120         /* Increment clock ticks */
    121         Clock_driver_ticks += 1;
    122 
    123         /* Enable external exceptions */
    124         msr = ppc_external_exceptions_enable();
    125 
    126         /* Call clock ticker  */
    127         ppc_clock_tick();
    128 
    129         /* Restore machine state */
    130         ppc_external_exceptions_disable( msr);
    131 
    132         return 0;
    133 }
    134 
    135 static int ppc_clock_exception_handler_e300( BSP_Exception_frame *frame, unsigned number)
    136 {
    137         uint32_t msr;
    138119
    139120        /* Increment clock ticks */
     
    219200                /* Enable decrementer and auto-reload */
    220201                PPC_SET_SPECIAL_PURPOSE_REGISTER_BITS( BOOKE_TCR, BOOKE_TCR_DIE | BOOKE_TCR_ARE);
    221         } else if (cpu_type == PPC_e300c2 || cpu_type == PPC_e300c3) {
    222                 /* TODO: Not tested for e300c2 */
    223 
    224                 /* Enable auto-reload */
    225                 PPC_SET_SPECIAL_PURPOSE_REGISTER_BITS( HID0, 0x00000040);
    226 
    227                 /* Install exception handler */
    228                 ppc_exc_set_handler( ASM_DEC_VECTOR, ppc_clock_exception_handler_e300);
    229202        } else {
    230203                /* Here the decrementer value is actually the interval */
  • c/src/lib/libbsp/powerpc/tqm8xx/Makefile.am

    r74af8c0 r140c211  
    2424    include/irq.h \
    2525    ../../shared/include/irq-generic.h \
     26    ../../shared/include/irq-info.h \
    2627    spi/spi.h
    2728
  • c/src/lib/libbsp/powerpc/tqm8xx/preinstall.am

    r74af8c0 r140c211  
    7474PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-generic.h
    7575
     76$(PROJECT_INCLUDE)/bsp/irq-info.h: ../../shared/include/irq-info.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
     77        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/irq-info.h
     78PREINSTALL_FILES += $(PROJECT_INCLUDE)/bsp/irq-info.h
     79
    7680$(PROJECT_INCLUDE)/bsp/spi.h: spi/spi.h $(PROJECT_INCLUDE)/bsp/$(dirstamp)
    7781        $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/bsp/spi.h
Note: See TracChangeset for help on using the changeset viewer.