Changeset 0604477 in rtems


Ignore:
Timestamp:
Jun 5, 2012, 3:46:01 PM (8 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Children:
87194f9
Parents:
1a9e5c2 (diff), eb1951a (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/mpc55xxevb
Files:
2 added
6 edited
2 moved

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/powerpc/mpc55xxevb/Makefile.am

    r1a9e5c2 r0604477  
    2626dist_project_lib_DATA += startup/linkcmds.mpc5566evb
    2727dist_project_lib_DATA += startup/linkcmds.mpc5566evb_spe
     28dist_project_lib_DATA += startup/linkcmds.mpc5643l_evb
     29dist_project_lib_DATA += startup/linkcmds.mpc5643l_dpu
    2830dist_project_lib_DATA += startup/linkcmds.mpc5674fevb
    2931dist_project_lib_DATA += startup/linkcmds.mpc5674fevb_spe
    30 dist_project_lib_DATA += startup/linkcmds.xkt564levb
    3132dist_project_lib_DATA += startup/linkcmds.phycore_mpc5554
    3233
  • c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac

    r1a9e5c2 r0604477  
    2525
    2626RTEMS_BSPOPTS_SET_DATA_CACHE_ENABLED([gwlcfm],[])
    27 RTEMS_BSPOPTS_SET_DATA_CACHE_ENABLED([xkt564levb],[])
    28 RTEMS_BSPOPTS_SET_DATA_CACHE_ENABLED([mpc5566evb*],[1])
    29 RTEMS_BSPOPTS_SET_DATA_CACHE_ENABLED([mpc5674fevb*],[1])
     27RTEMS_BSPOPTS_SET_DATA_CACHE_ENABLED([mpc5643l*],[])
    3028RTEMS_BSPOPTS_SET_DATA_CACHE_ENABLED([*],[1])
    3129RTEMS_BSPOPTS_HELP_DATA_CACHE_ENABLED
    3230
    3331RTEMS_BSPOPTS_SET_INSTRUCTION_CACHE_ENABLED([gwlcfm],[])
    34 RTEMS_BSPOPTS_SET_INSTRUCTION_CACHE_ENABLED([mpc5566evb*],[1])
    35 RTEMS_BSPOPTS_SET_INSTRUCTION_CACHE_ENABLED([mpc5674fevb*],[1])
    3632RTEMS_BSPOPTS_SET_INSTRUCTION_CACHE_ENABLED([*],[1])
    3733RTEMS_BSPOPTS_HELP_INSTRUCTION_CACHE_ENABLED
    3834
    39 RTEMS_BSPOPTS_SET([BSP_INTERRUPT_HANDLER_TABLE_SIZE],[mpc5674fevb*],[255])
    40 RTEMS_BSPOPTS_SET([BSP_INTERRUPT_HANDLER_TABLE_SIZE],[xkt564levb*],[127])
    41 RTEMS_BSPOPTS_SET([BSP_INTERRUPT_HANDLER_TABLE_SIZE],[mpc5566evb*],[127])
     35RTEMS_BSPOPTS_SET([BSP_INTERRUPT_HANDLER_TABLE_SIZE],[mpc5643l*],[127])
     36RTEMS_BSPOPTS_SET([BSP_INTERRUPT_HANDLER_TABLE_SIZE],[mpc5566*],[127])
     37RTEMS_BSPOPTS_SET([BSP_INTERRUPT_HANDLER_TABLE_SIZE],[mpc5674f*],[255])
    4238RTEMS_BSPOPTS_SET([BSP_INTERRUPT_HANDLER_TABLE_SIZE],[*],[63])
    4339RTEMS_BSPOPTS_HELP([BSP_INTERRUPT_HANDLER_TABLE_SIZE],
     
    5248[define to zero or one to disable or enable interrupts for the eSCI devices])
    5349
    54 RTEMS_BSPOPTS_SET([MPC55XX_FMPLL_REF_CLOCK],[gwlcfm],[40000000])
    55 RTEMS_BSPOPTS_SET([MPC55XX_FMPLL_REF_CLOCK],[xkt564levb*],[40000000])
    56 RTEMS_BSPOPTS_SET([MPC55XX_FMPLL_REF_CLOCK],[mpc5674fevb*],[40000000])
    57 RTEMS_BSPOPTS_SET([MPC55XX_FMPLL_REF_CLOCK],[*]     ,[8000000])
    58 RTEMS_BSPOPTS_HELP([MPC55XX_FMPLL_REF_CLOCK],
     50RTEMS_BSPOPTS_SET([MPC55XX_REFERENCE_CLOCK],[gwlcfm],[40000000])
     51RTEMS_BSPOPTS_SET([MPC55XX_REFERENCE_CLOCK],[mpc5643l_evb*],[40000000])
     52RTEMS_BSPOPTS_SET([MPC55XX_REFERENCE_CLOCK],[mpc5674fevb*],[40000000])
     53RTEMS_BSPOPTS_SET([MPC55XX_REFERENCE_CLOCK],[*],[8000000])
     54RTEMS_BSPOPTS_HELP([MPC55XX_REFERENCE_CLOCK],
    5955[Must be defined to be the external reference clock (in Hz)
    6056 for clock generation])
     
    7874[Must be defined to be the PLL multiplication factor for clock generation])
    7975
    80 RTEMS_BSPOPTS_SET([MPC55XX_EMIOS_PRESCALER],[xkt564levb*],[])
    8176RTEMS_BSPOPTS_SET([MPC55XX_EMIOS_PRESCALER],[gwlcfm],[66])
     77RTEMS_BSPOPTS_SET([MPC55XX_EMIOS_PRESCALER],[mpc5643l*],[])
    8278RTEMS_BSPOPTS_SET([MPC55XX_EMIOS_PRESCALER],[*]     ,[1])
    8379RTEMS_BSPOPTS_HELP([MPC55XX_EMIOS_PRESCALER],
     
    10096[transmit eDMA channel for SMSC9218I network interface])
    10197
     98RTEMS_BSPOPTS_SET([MPC55XX_CLOCK_EMIOS_CHANNEL],[mpc5643l*],[])
    10299RTEMS_BSPOPTS_SET([MPC55XX_CLOCK_EMIOS_CHANNEL],[mpc5674fevb*],[31])
    103 RTEMS_BSPOPTS_SET([MPC55XX_CLOCK_EMIOS_CHANNEL],[xkt564levb*],[])
    104100RTEMS_BSPOPTS_SET([MPC55XX_CLOCK_EMIOS_CHANNEL],[*],[23])
    105101RTEMS_BSPOPTS_HELP([MPC55XX_CLOCK_EMIOS_CHANNEL],
    106102[selects the eMIOS channel for the RTEMS system tick (the default is the last channel)])
    107103
    108 RTEMS_BSPOPTS_SET([MPC55XX_CLOCK_PIT_CHANNEL],[xkt564levb*],[3])
     104RTEMS_BSPOPTS_SET([MPC55XX_CLOCK_PIT_CHANNEL],[mpc5643l*],[3])
    109105RTEMS_BSPOPTS_SET([MPC55XX_CLOCK_PIT_CHANNEL],[*],[])
    110106RTEMS_BSPOPTS_HELP([MPC55XX_CLOCK_PIT_CHANNEL],
    111107[selects the PIT channel for the RTEMS system tick (the default is the last channel)])
    112108
    113 RTEMS_BSPOPTS_SET([MPC55XX_CHIP_TYPE],[mpc5674fevb*],[5674])
    114 RTEMS_BSPOPTS_SET([MPC55XX_CHIP_TYPE],[xkt564levb*],[5643])
    115 RTEMS_BSPOPTS_SET([MPC55XX_CHIP_TYPE],[mpc5566evb*],[5566])
    116 RTEMS_BSPOPTS_SET([MPC55XX_CHIP_TYPE],[gwlcfm]    ,[5516])
    117 RTEMS_BSPOPTS_SET([MPC55XX_CHIP_TYPE],[*]         ,[5554])
     109RTEMS_BSPOPTS_SET([MPC55XX_CHIP_TYPE],[gwlcfm],[5516])
     110RTEMS_BSPOPTS_SET([MPC55XX_CHIP_TYPE],[mpc5566*],[5566])
     111RTEMS_BSPOPTS_SET([MPC55XX_CHIP_TYPE],[mpc5643l*],[5643])
     112RTEMS_BSPOPTS_SET([MPC55XX_CHIP_TYPE],[mpc5674f*],[5674])
     113RTEMS_BSPOPTS_SET([MPC55XX_CHIP_TYPE],[*],[5554])
    118114RTEMS_BSPOPTS_HELP([MPC55XX_CHIP_TYPE],
    119115[specifies the chip type in use (e.g. 5554 for MPC5554)])
     
    129125RTEMS_BSPOPTS_SET([MPC55XX_BOARD_MPC5674FEVB],[mpc5674fevb*],[1])
    130126RTEMS_BSPOPTS_HELP([MPC55XX_BOARD_MPC5674FEVB],[if defined, use custom settings for MPC5674FEVB board])
    131 
    132 RTEMS_BSPOPTS_SET([MPC55XX_BOARD_XKT564LEVB],[xkt564levb*],[1])
    133 RTEMS_BSPOPTS_HELP([MPC55XX_BOARD_XKT564LEVB],[if defined, use custom settings for XKT564LEVB board])
    134127
    135128RTEMS_BSPOPTS_SET([MPC55XX_BOARD_MPC5566EVB],[mpc5566evb*],[1])
  • c/src/lib/libbsp/powerpc/mpc55xxevb/include/bspopts.h.in

    r1a9e5c2 r0604477  
    3636/* if defined, use custom settings for phyCORE MPC5554 board */
    3737#undef MPC55XX_BOARD_PHYCORE_MPC5554
    38 
    39 /* if defined, use custom settings for XKT564LEVB board */
    40 #undef MPC55XX_BOARD_XKT564LEVB
    4138
    4239/* if defined, builds in bootflags above the RCHW for setup in a debugger to
     
    7976/* Must be defined to be the external reference clock (in Hz) for clock
    8077   generation */
    81 #undef MPC55XX_FMPLL_REF_CLOCK
     78#undef MPC55XX_REFERENCE_CLOCK
    8279
    8380/* Define to the address where bug reports for this package should be sent. */
  • c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am

    r1a9e5c2 r0604477  
    7474PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5566evb_spe
    7575
     76$(PROJECT_LIB)/linkcmds.mpc5643l_evb: startup/linkcmds.mpc5643l_evb $(PROJECT_LIB)/$(dirstamp)
     77        $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5643l_evb
     78PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5643l_evb
     79
     80$(PROJECT_LIB)/linkcmds.mpc5643l_dpu: startup/linkcmds.mpc5643l_dpu $(PROJECT_LIB)/$(dirstamp)
     81        $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5643l_dpu
     82PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5643l_dpu
     83
    7684$(PROJECT_LIB)/linkcmds.mpc5674fevb: startup/linkcmds.mpc5674fevb $(PROJECT_LIB)/$(dirstamp)
    7785        $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5674fevb
     
    8189        $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5674fevb_spe
    8290PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5674fevb_spe
    83 
    84 $(PROJECT_LIB)/linkcmds.xkt564levb: startup/linkcmds.xkt564levb $(PROJECT_LIB)/$(dirstamp)
    85         $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.xkt564levb
    86 PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.xkt564levb
    8791
    8892$(PROJECT_LIB)/linkcmds.phycore_mpc5554: startup/linkcmds.phycore_mpc5554 $(PROJECT_LIB)/$(dirstamp)
  • c/src/lib/libbsp/powerpc/mpc55xxevb/startup/get-system-clock.c

    r1a9e5c2 r0604477  
    3232    volatile struct FMPLL_tag *fmpll = &FMPLL;
    3333    union FMPLL_SYNSR_tag synsr = { .R = fmpll->SYNSR.R };
    34     uint32_t reference_clock = MPC55XX_FMPLL_REF_CLOCK;
     34    uint32_t reference_clock = MPC55XX_REFERENCE_CLOCK;
    3535    bool pll_clock_mode = synsr.B.MODE != 0;
    3636    bool crystal_or_external_reference_mode = synsr.B.PLLSEL != 0;
     
    5555    volatile struct FMPLL_tag *fmpll = &FMPLL;
    5656    union FMPLL_ESYNCR1_tag esyncr1 = { .R = fmpll->ESYNCR1.R };
    57     uint32_t reference_clock = MPC55XX_FMPLL_REF_CLOCK;
     57    uint32_t reference_clock = MPC55XX_REFERENCE_CLOCK;
    5858    bool normal_mode = (esyncr1.B.CLKCFG & 0x4U) != 0;
    5959
     
    7474    /* FIXME: Assumes normal mode and external oscillator */
    7575    PLLD_CR_32B_tag cr = { . R = CGM.FMPLL [0].CR.R };
    76     uint32_t xosc = MPC55XX_FMPLL_REF_CLOCK;
     76    uint32_t xosc = MPC55XX_REFERENCE_CLOCK;
    7777    uint32_t ldf = cr.B.NDIV;
    7878    uint32_t idf = cr.B.IDF + 1;
  • c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5643l_evb

    r1a9e5c2 r0604477  
    11MEMORY {
    22        ROM : ORIGIN = 0x0, LENGTH = 1M
    3         RAM_0 : ORIGIN = 0x40000000, LENGTH = 64K
     3        RAM : ORIGIN = 0x40000000, LENGTH = 64K
    44        RAM_1 : ORIGIN = 0x50000000, LENGTH = 64K
    55        RAM_EXT : ORIGIN = 0x0, LENGTH = 0
     
    1313
    1414REGION_ALIAS ("REGION_START", ROM);
    15 REGION_ALIAS ("REGION_FAST_TEXT", RAM_0);
     15REGION_ALIAS ("REGION_FAST_TEXT", RAM);
    1616REGION_ALIAS ("REGION_FAST_TEXT_LOAD", ROM);
    1717REGION_ALIAS ("REGION_TEXT", ROM);
     
    1919REGION_ALIAS ("REGION_RODATA", ROM);
    2020REGION_ALIAS ("REGION_RODATA_LOAD", ROM);
    21 REGION_ALIAS ("REGION_FAST_DATA", RAM_0);
     21REGION_ALIAS ("REGION_FAST_DATA", RAM);
    2222REGION_ALIAS ("REGION_FAST_DATA_LOAD", ROM);
    23 REGION_ALIAS ("REGION_DATA", RAM_0);
     23REGION_ALIAS ("REGION_DATA", RAM);
    2424REGION_ALIAS ("REGION_DATA_LOAD", ROM);
    25 REGION_ALIAS ("REGION_BSS", RAM_0);
    26 REGION_ALIAS ("REGION_RWEXTRA", RAM_0);
     25REGION_ALIAS ("REGION_BSS", RAM);
     26REGION_ALIAS ("REGION_RWEXTRA", RAM);
    2727REGION_ALIAS ("REGION_WORK", RAM_1);
    2828REGION_ALIAS ("REGION_STACK", RAM_1);
  • c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-clock.c

    r1a9e5c2 r0604477  
    4848    #define EPREDIV_VAL (MPC55XX_FMPLL_PREDIV-1)
    4949    #define EMFD_VAL    (MPC55XX_FMPLL_MFD-16)
    50     #define VCO_CLK_REF (MPC55XX_FMPLL_REF_CLOCK/(EPREDIV_VAL+1))
     50    #define VCO_CLK_REF (MPC55XX_REFERENCE_CLOCK/(EPREDIV_VAL+1))
    5151    #define VCO_CLK_OUT (VCO_CLK_REF*(EMFD_VAL+16))
    5252    #define ERFD_VAL    ((VCO_CLK_OUT/MPC55XX_FMPLL_CLK_OUT)-1)
     
    9191      {
    9292        .cr = {
    93           .B = { .IDF = 3, .ODF = 1, .NDIV = 48, .I_LOCK = 1, .PLL_ON = 1 }
     93          #if MPC55XX_REFERENCE_CLOCK == 8000000
     94            .B = { .IDF = 0, .ODF = 1, .NDIV = 60, .I_LOCK = 1, .PLL_ON = 1 }
     95          #elif MPC55XX_REFERENCE_CLOCK == 40000000
     96            .B = { .IDF = 3, .ODF = 1, .NDIV = 48, .I_LOCK = 1, .PLL_ON = 1 }
     97          #else
     98            #error "unexpected reference clock"
     99          #endif
    94100        }
    95101      },
     
    104110    },
    105111    .auxclk = {
     112      [0] = {
     113        .AC_SC = { .B = { .SELCTL = 4 } },
     114        .AC_DC0_3 = { .B = { .DE0 = 1, .DIV0 = 0 } }
     115      },
    106116      [1] = {
    107117        .AC_SC = { .B = { .SELCTL = 4 } },
Note: See TracChangeset for help on using the changeset viewer.