Changeset 47fb2fe in rtems


Ignore:
Timestamp:
Apr 11, 2013, 3:22:02 PM (6 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, master
Children:
d5587f9f
Parents:
76de8a8e
git-author:
Sebastian Huber <sebastian.huber@…> (04/11/13 15:22:02)
git-committer:
Sebastian Huber <sebastian.huber@…> (04/23/13 07:59:55)
Message:

bsp/mpc5200: Add MPC5200_BOARD prefix

Location:
c/src/lib/libbsp/powerpc/gen5200
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • c/src/lib/libbsp/powerpc/gen5200/configure.ac

    r76de8a8e r47fb2fe  
    9494RTEMS_BSPOPTS_HELP([PRINTK_MINOR],[console minor number used by printk()])
    9595
    96 RTEMS_BSPOPTS_SET([PM520_ZE30],[pm520_ze30],[1])
    97 RTEMS_BSPOPTS_HELP([PM520_ZE30],
     96RTEMS_BSPOPTS_SET([MPC5200_BOARD_PM520_ZE30],[pm520_ze30],[1])
     97RTEMS_BSPOPTS_HELP([MPC5200_BOARD_PM520_ZE30],
    9898[enable settings for PM520 ZE30])
    9999
    100 RTEMS_BSPOPTS_SET([PM520_CR825],[pm520_cr825],[1])
    101 RTEMS_BSPOPTS_HELP([PM520_CR825],
     100RTEMS_BSPOPTS_SET([MPC5200_BOARD_PM520_CR825],[pm520_cr825],[1])
     101RTEMS_BSPOPTS_HELP([MPC5200_BOARD_PM520_CR825],
    102102[enable settings for PM520 CR825])
    103103
    104 RTEMS_BSPOPTS_SET([icecube],[icecube],[1])
    105 RTEMS_BSPOPTS_HELP([icecube],
     104RTEMS_BSPOPTS_SET([MPC5200_BOARD_ICECUBE],[icecube],[1])
     105RTEMS_BSPOPTS_HELP([MPC5200_BOARD_ICECUBE],
    106106[enable settings for IceCube])
    107107
    108 RTEMS_BSPOPTS_SET([BRS5L],[brs5l],[1])
    109 RTEMS_BSPOPTS_HELP([BRS5L],
     108RTEMS_BSPOPTS_SET([MPC5200_BOARD_BRS5L],[brs5l],[1])
     109RTEMS_BSPOPTS_HELP([MPC5200_BOARD_BRS5L],
    110110[enable settings for BRS5L])
    111111
    112 RTEMS_BSPOPTS_SET([BSP_TYPE_DP2],[dp2],[1])
    113 RTEMS_BSPOPTS_HELP([BSP_TYPE_DP2],
     112RTEMS_BSPOPTS_SET([MPC5200_BOARD_DP2],[dp2],[1])
     113RTEMS_BSPOPTS_HELP([MPC5200_BOARD_DP2],
    114114[enable settings for DP2])
    115115
  • c/src/lib/libbsp/powerpc/gen5200/ide/ata.c

    r76de8a8e r47fb2fe  
    101101  bool card_present = true;
    102102
    103 #ifdef BRS5L
     103#ifdef MPC5200_BOARD_BRS5L
    104104  volatile struct mpc5200_gpt *gpt = &mpc5200.gpt[GPT2];
    105105
  • c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c

    r76de8a8e r47fb2fe  
    143143  struct mpc5200_gpt *gpt = (struct mpc5200_gpt *)(&mpc5200.gpt[GPT2]);
    144144
    145   #ifdef BSP_TYPE_DP2
     145  #ifdef MPC5200_BOARD_DP2
    146146    /* Deactivate RESET signal */
    147147    rtems_interrupt_level level;
     
    160160  gpt->emsel = (GPT_EMSEL_GPIO_IN | GPT_EMSEL_TIMER_MS_GPIO);
    161161
    162 #if defined (BRS5L)
     162#if defined (MPC5200_BOARD_BRS5L)
    163163  /* Check for card detection (-CD0) */
    164164  if((gpt->status) & GPT_STATUS_PIN)
     
    642642void mpc5200_pcmciaide_initialize(int minor)
    643643  {
    644 #if defined (BRS5L)
     644#if defined (MPC5200_BOARD_BRS5L)
    645645  struct mpc5200_gpt *gpt = (struct mpc5200_gpt *)(&mpc5200.gpt[GPT7]);
    646646
  • c/src/lib/libbsp/powerpc/gen5200/include/bsp.h

    r76de8a8e r47fb2fe  
    6464LINKER_SYMBOL(MBAR);
    6565
     66/* Provide legacy defines */
     67
     68#ifdef MPC5200_BOARD_PM520_ZE30
     69#define PM520_ZE30
     70#endif
     71
     72#ifdef MPC5200_BOARD_PM520_CR825
     73#define PM520_CR825
     74#endif
     75
     76#ifdef MPC5200_BOARD_ICECUBE
     77#define icecube
     78#endif
     79
     80#ifdef MPC5200_BOARD_BRS5L
     81#define BRS5L
     82#endif
     83
    6684/*
    6785 * distinguish board characteristics
     
    7088 * for PM520 mdule on a ZE30 carrier
    7189 */
    72 #if defined(PM520_ZE30)
     90#if defined(MPC5200_BOARD_PM520_ZE30)
    7391#define PM520
    7492#endif
     
    7694 * for PM520 mdule on a CR825 carrier
    7795 */
    78 #if defined(PM520_CR825)
     96#if defined(MPC5200_BOARD_PM520_CR825)
    7997#define PM520
    8098#endif
     
    85103#endif
    86104
    87 #if defined(BRS5L)
     105#if defined(MPC5200_BOARD_BRS5L)
    88106/*
    89107 * IMD Custom Board BRS5L
     
    94112#elif defined (PM520)
    95113
    96 #elif defined (icecube)
     114/* Nothing special */
     115
     116#elif defined (MPC5200_BOARD_ICECUBE)
    97117/*
    98118 *  Codename: IceCube
     
    102122 */
    103123
    104 #elif defined (BSP_TYPE_DP2)
     124#elif defined (MPC5200_BOARD_DP2)
     125
     126/* Nothing special */
    105127
    106128#else
     
    172194#define XLB_CLOCK (bsp_uboot_board_info.bi_busfreq)
    173195#define G2_CLOCK  (bsp_uboot_board_info.bi_intfreq)
    174 #elif defined(BRS5L)
     196#elif defined(MPC5200_BOARD_BRS5L)
    175197#define IPB_CLOCK 66000000   /* 66 MHz */
    176198#define XLB_CLOCK 132000000  /* 132 MHz */
  • c/src/lib/libbsp/powerpc/gen5200/start/start.S

    r76de8a8e r47fb2fe  
    293293
    294294
    295 #ifdef BRS5L
     295#ifdef MPC5200_BOARD_BRS5L
    296296        LWI     r30, CSBOOTROM_VAL
    297297        stw     r30, CSBOOTROM(r31)             /* Set CSBOOTROM */
    298298
    299299
    300 #endif /* BRS5L */
     300#endif /* MPC5200_BOARD_BRS5L */
    301301
    302302
     
    490490#if defined(NEED_LOW_LEVEL_INIT)
    491491SDRAM_init:
    492 #if defined(BRS5L)
     492#if defined(MPC5200_BOARD_BRS5L)
    493493      /* set GPIO_WKUP7 pin low for 66MHz buffering */
    494494      /* or high for 133MHz registered buffering    */
     
    538538        stw     r30, CFG2(r31)                  /* Burst Read2Write delay=0xB, Burst length=0x7, Read Tap=0x4 */
    539539
    540 #ifdef BRS5L
     540#ifdef MPC5200_BOARD_BRS5L
    541541        LWI     r30, 0xD1470000                 /* Mode Set enabled, Clock enabled, Auto refresh enabled, Mem. data drv */
    542542        stw     r30, CTRL(r31)                  /* Refresh counter=0xFFFF */
  • c/src/lib/libbsp/powerpc/gen5200/startup/cpuinit.c

    r76de8a8e r47fb2fe  
    115115static void cpu_init_bsp(void)
    116116{
    117 #if defined (BRS5L)
     117#if defined (MPC5200_BOARD_BRS5L)
    118118  BAT dbat;
    119119
     
    252252#endif
    253253
    254 #if defined(BSP_TYPE_DP2)
     254#if defined(MPC5200_BOARD_DP2)
    255255  /* Enable BAT4-7 */
    256256  PPC_SET_SPECIAL_PURPOSE_REGISTER_BITS(HID2, BSP_BBIT32(13));
     
    268268  );
    269269  SET_DBAT(4, dbat.batu, dbat.batl);
    270 #elif defined(PM520_ZE30)
     270#elif defined(MPC5200_BOARD_PM520_ZE30)
    271271  /* Enable BAT4-7 */
    272272  PPC_SET_SPECIAL_PURPOSE_REGISTER_BITS(HID2, BSP_BBIT32(13));
Note: See TracChangeset for help on using the changeset viewer.