Changeset dc5cd79 in rtems


Ignore:
Timestamp:
Feb 6, 2013, 10:37:26 AM (7 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, master
Children:
4b53f191
Parents:
c082b575
git-author:
Sebastian Huber <sebastian.huber@…> (02/06/13 10:37:26)
git-committer:
Sebastian Huber <sebastian.huber@…> (02/06/13 14:35:55)
Message:

bsp/mpc55xx: Merge RSM6 variants into one

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

Legend:

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

    rc082b575 rdc5cd79  
    3535dist_project_lib_DATA += startup/linkcmds.mpc5674f_ecu508_app
    3636dist_project_lib_DATA += startup/linkcmds.mpc5674f_rsm6
    37 dist_project_lib_DATA += startup/linkcmds.mpc5674f_rsm6_koma_boot
    38 dist_project_lib_DATA += startup/linkcmds.mpc5674f_rsm6_koma_app
    39 dist_project_lib_DATA += startup/linkcmds.mpc5674f_rsm6_moma_boot
    40 dist_project_lib_DATA += startup/linkcmds.mpc5674f_rsm6_moma_app
     37dist_project_lib_DATA += startup/linkcmds.mpc5674f_rsm6_base
    4138
    4239noinst_LIBRARIES += libbsp.a
  • c/src/lib/libbsp/powerpc/mpc55xxevb/configure.ac

    rc082b575 rdc5cd79  
    9292[Must be defined to be the PLL multiplication factor for clock generation])
    9393
    94 RTEMS_BSPOPTS_SET([MPC55XX_FMPLL_ESYNCR1_CLKCFG],[mpc5674f_rsm6*],[6])
     94RTEMS_BSPOPTS_SET([MPC55XX_FMPLL_ESYNCR1_CLKCFG],[mpc5674f_rsm6],[6])
    9595RTEMS_BSPOPTS_SET([MPC55XX_FMPLL_ESYNCR1_CLKCFG],[*],[7])
    9696RTEMS_BSPOPTS_HELP([MPC55XX_FMPLL_ESYNCR1_CLKCFG],
     
    190190RTEMS_BSPOPTS_HELP([MPC55XX_BOARD_MPC5674F_ECU508],[if defined, use custom settings for ECU508 board])
    191191
    192 RTEMS_BSPOPTS_SET([MPC55XX_BOARD_MPC5674F_RSM6],[mpc5674f_rsm6*],[1])
     192RTEMS_BSPOPTS_SET([MPC55XX_BOARD_MPC5674F_RSM6],[mpc5674f_rsm6],[1])
    193193RTEMS_BSPOPTS_HELP([MPC55XX_BOARD_MPC5674F_RSM6],[if defined, use custom settings for RSM6 board])
    194 
    195 RTEMS_BSPOPTS_SET([MPC55XX_BOARD_MPC5674F_RSM6_KOMA],[mpc5674f_rsm6_koma*],[1])
    196 RTEMS_BSPOPTS_HELP([MPC55XX_BOARD_MPC5674F_RSM6_KOMA],[if defined, use custom settings for RSM6 board KoMa controller])
    197 
    198 RTEMS_BSPOPTS_SET([MPC55XX_BOARD_MPC5674F_RSM6_MOMA],[mpc5674f_rsm6_moma*],[1])
    199 RTEMS_BSPOPTS_HELP([MPC55XX_BOARD_MPC5674F_RSM6_MOMA],[if defined, use custom settings for RSM6 board MoMa controller])
    200194
    201195RTEMS_BSPOPTS_SET([MPC55XX_BOARD_PHYCORE_MPC5554],[phycore_mpc5554],[1])
  • c/src/lib/libbsp/powerpc/mpc55xxevb/preinstall.am

    rc082b575 rdc5cd79  
    110110PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5674f_rsm6
    111111
    112 $(PROJECT_LIB)/linkcmds.mpc5674f_rsm6_koma_boot: startup/linkcmds.mpc5674f_rsm6_koma_boot $(PROJECT_LIB)/$(dirstamp)
    113         $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5674f_rsm6_koma_boot
    114 PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5674f_rsm6_koma_boot
    115 
    116 $(PROJECT_LIB)/linkcmds.mpc5674f_rsm6_koma_app: startup/linkcmds.mpc5674f_rsm6_koma_app $(PROJECT_LIB)/$(dirstamp)
    117         $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5674f_rsm6_koma_app
    118 PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5674f_rsm6_koma_app
    119 
    120 $(PROJECT_LIB)/linkcmds.mpc5674f_rsm6_moma_boot: startup/linkcmds.mpc5674f_rsm6_moma_boot $(PROJECT_LIB)/$(dirstamp)
    121         $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5674f_rsm6_moma_boot
    122 PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5674f_rsm6_moma_boot
    123 
    124 $(PROJECT_LIB)/linkcmds.mpc5674f_rsm6_moma_app: startup/linkcmds.mpc5674f_rsm6_moma_app $(PROJECT_LIB)/$(dirstamp)
    125         $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5674f_rsm6_moma_app
    126 PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5674f_rsm6_moma_app
     112$(PROJECT_LIB)/linkcmds.mpc5674f_rsm6_base: startup/linkcmds.mpc5674f_rsm6_base $(PROJECT_LIB)/$(dirstamp)
     113        $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc5674f_rsm6_base
     114PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc5674f_rsm6_base
    127115
    128116$(PROJECT_INCLUDE)/bsp.h: include/bsp.h $(PROJECT_INCLUDE)/$(dirstamp)
  • c/src/lib/libbsp/powerpc/mpc55xxevb/startup/linkcmds.mpc5674f_rsm6

    rc082b575 rdc5cd79  
    11MEMORY {
    2         RAM : ORIGIN = 0x40000000, LENGTH = 240k
    3         NOCACHE : ORIGIN = 0x4003c000, LENGTH = 16k
    4         MRAM : ORIGIN = 0x20000000, LENGTH = 4M
     2        STARTROM : ORIGIN = 0x0, LENGTH = 32k
     3        ROM : ORIGIN = 0x40000, LENGTH = 768k
    54}
    65
    7 REGION_ALIAS ("RAM_EXT", RAM);
    8 
    9 REGION_ALIAS ("REGION_START", STARTROM);
    10 REGION_ALIAS ("REGION_FAST_TEXT", RAM);
    11 REGION_ALIAS ("REGION_FAST_TEXT_LOAD", ROM);
    12 REGION_ALIAS ("REGION_TEXT", ROM);
    13 REGION_ALIAS ("REGION_TEXT_LOAD", ROM);
    14 REGION_ALIAS ("REGION_RODATA", ROM);
    15 REGION_ALIAS ("REGION_RODATA_LOAD", ROM);
    16 REGION_ALIAS ("REGION_FAST_DATA", RAM);
    17 REGION_ALIAS ("REGION_FAST_DATA_LOAD", ROM);
    18 REGION_ALIAS ("REGION_DATA", RAM);
    19 REGION_ALIAS ("REGION_DATA_LOAD", ROM);
    20 REGION_ALIAS ("REGION_BSS", RAM);
    21 REGION_ALIAS ("REGION_RWEXTRA", RAM);
    22 REGION_ALIAS ("REGION_WORK", RAM);
    23 REGION_ALIAS ("REGION_STACK", RAM);
    24 REGION_ALIAS ("REGION_NOCACHE", NOCACHE);
    25 REGION_ALIAS ("REGION_NOCACHE_LOAD", ROM);
    26 REGION_ALIAS ("REGION_NVRAM", MRAM);
    27 
    28 INCLUDE linkcmds.mpc55xx
     6INCLUDE linkcmds.mpc5674f_rsm6_base
  • c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-ebi-cs-cal.c

    rc082b575 rdc5cd79  
    170170    }
    171171  }
    172 #elif defined(MPC55XX_BOARD_MPC5674F_RSM6) \
    173   && defined(MPC55XX_NEEDS_LOW_LEVEL_INIT)
     172#elif defined(MPC55XX_BOARD_MPC5674F_RSM6)
    174173  /* D_CS0 for MRAM */
    175174  {
     
    226225  },
    227226
    228   #if defined(MPC55XX_BOARD_MPC5674F_RSM6_KOMA)
    229     /* D_CS3 for Ethernet Controller */
    230     {
    231       .BR = {
    232         .B = {
    233           .BA = 0x23000000 >> 15,
    234           .PS = 1,
    235           .AD_MUX = 1,
    236           .BL = 0,
    237           .WEBS = 1,
    238           .TBDIP = 0,
    239           .SETA = 0,
    240           .BI = 1,
    241           .V = 1
    242       }
    243     },
    244       .OR = {
    245         .B = {
    246           .AM = 0xfff80000 >> 15,
    247           .SCY = 8,
    248           .BSCY = 0
    249         }
    250       }
    251     }
    252   #else
    253     /* D_CS3 unused */
    254     {
    255       .BR = { .R = 0x20000002 },
    256       .OR = { .R = 0xe0000000 }
    257     }
    258   #endif
     227  /* D_CS3 for Ethernet Controller */
     228  {
     229    .BR = {
     230      .B = {
     231        .BA = 0x23000000 >> 15,
     232        .PS = 1,
     233        .AD_MUX = 1,
     234        .BL = 0,
     235        .WEBS = 1,
     236        .TBDIP = 0,
     237        .SETA = 0,
     238        .BI = 1,
     239        .V = 1
     240    }
     241  },
     242    .OR = {
     243      .B = {
     244        .AM = 0xfff80000 >> 15,
     245        .SCY = 8,
     246        .BSCY = 0
     247      }
     248    }
     249  }
    259250#endif
    260251};
  • c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-mmu.c

    rc082b575 rdc5cd79  
    108108  #else
    109109    /* Used as cache-inhibited area (ADC, DSPI queues) */
    110     MPC55XX_MMU_TAG_INITIALIZER(14, 0x4003c000, MPC55XX_MMU_16K,  0, 1, 1, 1),
     110    MPC55XX_MMU_TAG_INITIALIZER(14, 0x4003c000, MPC55XX_MMU_16K,  0, 1, 1, 1)
    111111  #endif
    112112#elif defined(MPC55XX_BOARD_MPC5674F_RSM6)
    113   #if defined(MPC55XX_NEEDS_LOW_LEVEL_INIT)
    114     /* Arguments macro:       idx,  addr,       size,             x, w, r, io */
     113  /* Arguments macro:        idx, addr,       size,             x, w, r, io */
    115114
    116     /* Internal flash 4M */
    117     /* First 64k unused, to detect NULL pointer access */
    118     MPC55XX_MMU_TAG_INITIALIZER(1,  0x00000000, MPC55XX_MMU_64K,  1, 0, 1, 0),
    119     MPC55XX_MMU_TAG_INITIALIZER(5,  0x00010000, MPC55XX_MMU_64K,  1, 0, 1, 0),
    120     MPC55XX_MMU_TAG_INITIALIZER(6,  0x00020000, MPC55XX_MMU_128K, 1, 0, 1, 0),
    121     MPC55XX_MMU_TAG_INITIALIZER(7,  0x00040000, MPC55XX_MMU_256K, 1, 0, 1, 0),
    122     MPC55XX_MMU_TAG_INITIALIZER(8,  0x00080000, MPC55XX_MMU_512K, 1, 0, 1, 0),
    123     MPC55XX_MMU_TAG_INITIALIZER(9,  0x00100000, MPC55XX_MMU_1M,   1, 0, 1, 0),
    124     MPC55XX_MMU_TAG_INITIALIZER(10, 0x00200000, MPC55XX_MMU_2M,   1, 0, 1, 0),
    125     /* External MRAM 4M */
    126     MPC55XX_MMU_TAG_INITIALIZER(2,  0x20000000, MPC55XX_MMU_4M,   0, 1, 1, 0),
    127     /* Internal SRAM 256k */
    128     MPC55XX_MMU_TAG_INITIALIZER(3,  0x40000000, MPC55XX_MMU_256K, 0, 1, 1, 0),
    129     MPC55XX_MMU_TAG_INITIALIZER(11, 0x40020000, MPC55XX_MMU_64K,  0, 1, 1, 0),
    130     MPC55XX_MMU_TAG_INITIALIZER(12, 0x40030000, MPC55XX_MMU_32K,  0, 1, 1, 0),
    131     MPC55XX_MMU_TAG_INITIALIZER(13, 0x40038000, MPC55XX_MMU_16K,  0, 1, 1, 0),
    132     /* Used as cache-inhibited area (ADC, DSPI queues) */
    133     MPC55XX_MMU_TAG_INITIALIZER(14, 0x4003c000, MPC55XX_MMU_16K,  0, 1, 1, 1),
    134     /* External FPGA */
    135     MPC55XX_MMU_TAG_INITIALIZER(15, 0x21000000, MPC55XX_MMU_8M,   0, 1, 1, 1),
    136     #if defined(MPC55XX_BOARD_MPC5674F_RSM6_KOMA)
    137       /* External Ethernet controller */
    138       MPC55XX_MMU_TAG_INITIALIZER(17, 0x23000000, MPC55XX_MMU_1K, 0, 1, 1, 1),
    139     #endif
    140   #else
    141     /* Used as cache-inhibited area (ADC, DSPI queues) */
    142     MPC55XX_MMU_TAG_INITIALIZER(14, 0x4003c000, MPC55XX_MMU_16K,  0, 1, 1, 1),
    143   #endif
     115  /* Internal flash 4M */
     116  /* First 64k unused, to detect NULL pointer access */
     117  MPC55XX_MMU_TAG_INITIALIZER(1,  0x00000000, MPC55XX_MMU_64K,  1, 0, 1, 0),
     118  MPC55XX_MMU_TAG_INITIALIZER(5,  0x00010000, MPC55XX_MMU_64K,  1, 0, 1, 0),
     119  MPC55XX_MMU_TAG_INITIALIZER(6,  0x00020000, MPC55XX_MMU_128K, 1, 0, 1, 0),
     120  MPC55XX_MMU_TAG_INITIALIZER(7,  0x00040000, MPC55XX_MMU_256K, 1, 0, 1, 0),
     121  MPC55XX_MMU_TAG_INITIALIZER(8,  0x00080000, MPC55XX_MMU_512K, 1, 0, 1, 0),
     122  MPC55XX_MMU_TAG_INITIALIZER(9,  0x00100000, MPC55XX_MMU_1M,   1, 0, 1, 0),
     123  MPC55XX_MMU_TAG_INITIALIZER(10, 0x00200000, MPC55XX_MMU_2M,   1, 0, 1, 0),
     124  /* External MRAM 4M */
     125  MPC55XX_MMU_TAG_INITIALIZER(2,  0x20000000, MPC55XX_MMU_4M,   0, 1, 1, 0),
     126  /* Internal SRAM 256k */
     127  MPC55XX_MMU_TAG_INITIALIZER(3,  0x40000000, MPC55XX_MMU_256K, 0, 1, 1, 0),
     128  MPC55XX_MMU_TAG_INITIALIZER(11, 0x40020000, MPC55XX_MMU_64K,  0, 1, 1, 0),
     129  MPC55XX_MMU_TAG_INITIALIZER(12, 0x40030000, MPC55XX_MMU_32K,  0, 1, 1, 0),
     130  MPC55XX_MMU_TAG_INITIALIZER(13, 0x40038000, MPC55XX_MMU_16K,  0, 1, 1, 0),
     131  /* Used as cache-inhibited area (ADC, DSPI queues) */
     132  MPC55XX_MMU_TAG_INITIALIZER(14, 0x4003c000, MPC55XX_MMU_16K,  0, 1, 1, 1),
     133  /* External FPGA */
     134  MPC55XX_MMU_TAG_INITIALIZER(15, 0x21000000, MPC55XX_MMU_8M,   0, 1, 1, 1),
     135  /* External Ethernet controller */
     136  MPC55XX_MMU_TAG_INITIALIZER(16, 0x23000000, MPC55XX_MMU_1K,   0, 1, 1, 1)
    144137#elif MPC55XX_CHIP_FAMILY == 564
    145138  /* Internal flash 1M */
  • c/src/lib/libbsp/powerpc/mpc55xxevb/startup/start-config-siu-pcr.c

    rc082b575 rdc5cd79  
    128128  { 432,  1, 1, { .B = { .PA = 0, .OBE = 1, .WPE = 0 } } }, /* EMIOS26 (HBR34_RST) */
    129129  { 433,  1, 0, { .B = { .PA = 0, .OBE = 1, .WPE = 0 } } } /* EMIOS27 (\ETH_RST) */
    130 #elif defined(MPC55XX_BOARD_MPC5674F_RSM6) \
    131   && defined(MPC55XX_NEEDS_LOW_LEVEL_INIT)
     130#elif defined(MPC55XX_BOARD_MPC5674F_RSM6)
    132131  {  89,  1, 0, { .B = { .PA = 1, .OBE = 1, .IBE = 1, .WPE = 1, .WPS = 1 } } }, /* TXD_A (ESCI_A)*/
    133132  {  90,  1, 0, { .B = { .PA = 1, .OBE = 0, .IBE = 1, .WPE = 1, .WPS = 1 } } }, /* RXD_A (ESCI_A)*/
    134133  { 256,  1, 0, { .B = { .PA = 1, .DSC = 3, .WPE = 1, .WPS = 1 } } }, /* D_CS0 */
    135134  { 257,  1, 0, { .B = { .PA = 2, .DSC = 3, .WPE = 1, .WPS = 1 } } }, /* D_ADD_DAT31 */
    136   #if defined(MPC55XX_BOARD_MPC5674F_RSM6_KOMA)
    137     { 258,  1, 0, { .B = { .PA = 1, .DSC = 3, .WPE = 1, .WPS = 1 } } }, /* D_CS3 */
    138   #endif
     135  { 258,  1, 0, { .B = { .PA = 1, .DSC = 3, .WPE = 1, .WPS = 1 } } }, /* D_CS3 */
    139136  { 259,  4, 0, { .B = { .PA = 1, .DSC = 3, .WPE = 1, .WPS = 1 } } }, /* D_ADD12 .. D_ADD15 */
    140137  { 263, 15, 0, { .B = { .PA = 2, .DSC = 3, .WPE = 1, .WPS = 1 } } }, /* D_ADD_DAT16 .. D_ADD_DAT30 */
Note: See TracChangeset for help on using the changeset viewer.