Changeset 7a752161 in rtems


Ignore:
Timestamp:
09/26/11 10:08:29 (12 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, 5, master
Children:
a7d04d6
Parents:
c2bc9ef
Message:

2011-09-27 Sebastian Huber <sebastian.huber@…>

  • make/custom/mpc8309som.cfg, startup/linkcmds.mpc8309som: New file.
  • Makefile.am, preinstall.am: Reflect changes above.
  • configure.ac, console/console-config.c, include/bsp.h, include/hwreg_vals.h, include/irq.h, network/network.c, spi/spi_init.c, startup/cpuinit.c: Renamed various BSP options.
  • make/custom/gen83xx.inc, make/custom/hsc_cm01.cfg, make/custom/mpc8313erdb.cfg, make/custom/mpc8349eamds.cfg: Avoid special linkcmds.
Location:
c/src/lib/libbsp/powerpc/gen83xx
Files:
2 added
15 edited

Legend:

Unmodified
Added
Removed

  • c/src/lib/libbsp/powerpc/gen83xx/ChangeLog

    rc2bc9ef r7a752161  
     12011-09-27      Sebastian Huber <sebastian.huber@embedded-brains.de>
     2
     3        * make/custom/mpc8309som.cfg, startup/linkcmds.mpc8309som: New file.
     4        * Makefile.am, preinstall.am: Reflect changes above.
     5        * configure.ac, console/console-config.c, include/bsp.h,
     6        include/hwreg_vals.h, include/irq.h, network/network.c,
     7        spi/spi_init.c, startup/cpuinit.c: Renamed various BSP options.
     8        * make/custom/gen83xx.inc, make/custom/hsc_cm01.cfg,
     9        make/custom/mpc8313erdb.cfg, make/custom/mpc8349eamds.cfg: Avoid
     10        special linkcmds.
     11
    1122011-08-24      Sebastian Huber <sebastian.huber@embedded-brains.de>
    213

  • c/src/lib/libbsp/powerpc/gen83xx/Makefile.am

    rc2bc9ef r7a752161  
    3333dist_project_lib_DATA += startup/linkcmds \
    3434    startup/linkcmds.base \
     35    startup/linkcmds.mpc8309som \
    3536    startup/linkcmds.mpc8313erdb \
    3637    startup/linkcmds.mpc8349eamds \

  • c/src/lib/libbsp/powerpc/gen83xx/configure.ac

    rc2bc9ef r7a752161  
    2222RTEMS_BSPOPTS_HELP_INSTRUCTION_CACHE_ENABLED
    2323
    24 RTEMS_BSPOPTS_SET([MPC8313ERDB],[mpc8313erdb],[1])
    25 RTEMS_BSPOPTS_HELP([MPC8313ERDB],
    26 [If defined, use custom settings for the mpc8313erdb BSP.])
     24RTEMS_BSPOPTS_SET([MPC83XX_BOARD_MPC8313ERDB],[mpc8313erdb],[1])
     25RTEMS_BSPOPTS_HELP([MPC83XX_BOARD_MPC8313ERDB],
     26[if defined, then use settings for the MPC8313ERDB board])
    2727
    28 RTEMS_BSPOPTS_SET([MPC8349EAMDS],[mpc8349eamds],[1])
    29 RTEMS_BSPOPTS_HELP([MPC8349EAMDS],
    30 [If defined, use custom settings for the mpc8349eamds BSP.])
     28RTEMS_BSPOPTS_SET([MPC83XX_BOARD_MPC8349EAMDS],[mpc8349eamds],[1])
     29RTEMS_BSPOPTS_HELP([MPC83XX_BOARD_MPC8349EAMDS],
     30[if defined, then use settings for the MPC8349EAMDS board])
    3131
    32 RTEMS_BSPOPTS_SET([HSC_CM01],[hsc_cm01],[1])
    33 RTEMS_BSPOPTS_HELP([HSC_CM01],
    34 [If defined, use custom settings for the hsc_cm01 BSP.])
     32RTEMS_BSPOPTS_SET([MPC83XX_BOARD_HSC_CM01],[hsc_cm01],[1])
     33RTEMS_BSPOPTS_HELP([MPC83XX_BOARD_HSC_CM01],
     34[if defined, then use settings for the HSC_CM01 board])
    3535
    36 RTEMS_BSPOPTS_SET([MPC8349],[mpc8313erdb],[1])
    37 RTEMS_BSPOPTS_SET([MPC8349],[mpc8349eamds],[1])
    38 RTEMS_BSPOPTS_SET([MPC8349],[hsc_cm01],[1])
    39 RTEMS_BSPOPTS_HELP([MPC8349],
    40 [If defined, use custom settings for the MPC8349 libcpu family.])
     36RTEMS_BSPOPTS_SET([MPC83XX_BOARD_MPC8309SOM],[mpc8309som],[1])
     37RTEMS_BSPOPTS_HELP([MPC83XX_BOARD_MPC8309SOM],
     38[if defined, then use settings for the MPC8309SOM board])
    4139
    42 RTEMS_BSPOPTS_SET([BSP_CONSOLE_BAUD],[mpc8313erdb],[115200])
    43 RTEMS_BSPOPTS_SET([BSP_CONSOLE_BAUD],[*],[9600])
    44 RTEMS_BSPOPTS_HELP([BSP_CONSOLE_BAUD],[Default baud for console and other serial devices.])
     40RTEMS_BSPOPTS_SET([MPC83XX_CHIP_TYPE],[mpc8309som],[8309])
     41RTEMS_BSPOPTS_SET([MPC83XX_CHIP_TYPE],[mpc8349eamds],[8349])
     42RTEMS_BSPOPTS_SET([MPC83XX_CHIP_TYPE],[hsc_cm01],[8349])
     43RTEMS_BSPOPTS_SET([MPC83XX_CHIP_TYPE],[*],[8313])
     44RTEMS_BSPOPTS_HELP([MPC83XX_CHIP_TYPE],[chip type of the MPC83XX family])
    4545
    46 RTEMS_BSPOPTS_SET([BSP_USE_UART_INTERRUPTS],[mpc8313erdb],[1])
     46RTEMS_BSPOPTS_SET([BSP_CONSOLE_BAUD],[mpc8349eamds],[9600])
     47RTEMS_BSPOPTS_SET([BSP_CONSOLE_BAUD],[hsc_cm01],[9600])
     48RTEMS_BSPOPTS_SET([BSP_CONSOLE_BAUD],[*],[115200])
     49RTEMS_BSPOPTS_HELP([BSP_CONSOLE_BAUD],[default baud for console and other serial devices])
     50
     51RTEMS_BSPOPTS_SET([BSP_USE_UART_INTERRUPTS],[mpc8349eamds],[])
     52RTEMS_BSPOPTS_SET([BSP_USE_UART_INTERRUPTS],[hsc_cm01],[])
     53RTEMS_BSPOPTS_SET([BSP_USE_UART_INTERRUPTS],[*],[1])
    4754RTEMS_BSPOPTS_HELP([BSP_USE_UART_INTERRUPTS],[enable usage of interrupts for the UART modules])
    4855
    49 RTEMS_BSPOPTS_SET([BSP_USE_UART2],[mpc8313erdb],[1])
    50 RTEMS_BSPOPTS_SET([BSP_USE_UART2],[mpc8349eamds],[1])
    51 RTEMS_BSPOPTS_SET([BSP_USE_UART2],[hsc_cm01],[1])
    52 RTEMS_BSPOPTS_HELP([BSP_USE_UART2],[If defined, enables UART2.])
     56RTEMS_BSPOPTS_SET([BSP_USE_UART2],[*],[1])
     57RTEMS_BSPOPTS_HELP([BSP_USE_UART2],[if defined, enables UART2])
    5358
     59RTEMS_BSPOPTS_SET([HAS_UBOOT],[mpc8309som],[1])
    5460RTEMS_BSPOPTS_SET([HAS_UBOOT],[mpc8313erdb],[1])
    55 RTEMS_BSPOPTS_HELP([HAS_UBOOT],[If defined, enables U-Boot support.])
     61RTEMS_BSPOPTS_HELP([HAS_UBOOT],[if defined, enables U-Boot support])
    5662
    5763RTEMS_BSPOPTS_SET([GEN83XX_ENABLE_INTERRUPT_NESTING],[*],[1])
    … …  
    6672RTEMS_BSP_BOOTCARD_OPTIONS
    6773RTEMS_BSP_CLEANUP_OPTIONS(0, 0)
     74RTEMS_BSP_LINKCMDS
    6875
    6976RTEMS_PPC_EXCEPTIONS

  • c/src/lib/libbsp/powerpc/gen83xx/console/console-config.c

    rc2bc9ef r7a752161  
    8181    .setData = NULL,
    8282    .ulClock = 0,
     83#if MPC83XX_CHIP_TYPE / 10 == 830
     84    .ulIntVector = BSP_IPIC_IRQ_UART
     85#else
    8386    .ulIntVector = BSP_IPIC_IRQ_UART1
     87#endif
    8488  }
    8589#ifdef BSP_USE_UART2
    … …  
    101105    .setData = NULL,
    102106    .ulClock = 0,
     107#if MPC83XX_CHIP_TYPE / 10 == 830
     108    .ulIntVector = BSP_IPIC_IRQ_UART
     109#else
    103110    .ulIntVector = BSP_IPIC_IRQ_UART2
     111#endif
    104112  }
    105113#endif

  • c/src/lib/libbsp/powerpc/gen83xx/include/bsp.h

    rc2bc9ef r7a752161  
    9797#define RTEMS_BSP_NETWORK_DRIVER_ATTACH BSP_tsec_attach
    9898
    99 #ifdef MPC8313ERDB
     99#ifdef MPC83XX_BOARD_MPC8313ERDB
    100100  #define RTEMS_BSP_NETWORK_DRIVER_NAME "tsec2"
    101101  #define RTEMS_BSP_NETWORK_DRIVER_NAME2 "tsec1"
    … …  
    105105#endif
    106106
    107 #if defined(MPC8349EAMDS)
     107#if defined(MPC83XX_BOARD_MPC8349EAMDS)
    108108/*
    109109 * i2c EEPROM device name
    … …  
    117117#define RTEMS_BSP_SPI_FLASH_DEVICE_NAME "flash"
    118118#define RTEMS_BSP_SPI_FLASH_DEVICE_PATH "/dev/spi.flash"
    119 #endif /* defined(MPC8349EAMDS) */
     119#endif /* defined(MPC83XX_BOARD_MPC8349EAMDS) */
    120120
    121 #if defined(HSC_CM01)
     121#if defined(MPC83XX_BOARD_HSC_CM01)
    122122/*
    123123 * i2c EEPROM device name
    … …  
    131131#define RTEMS_BSP_SPI_FRAM_DEVICE_NAME "fram"
    132132#define RTEMS_BSP_SPI_FRAM_DEVICE_PATH "/dev/spi.fram"
    133 #endif /* defined(HSC_CM01) */
     133#endif /* defined(MPC83XX_BOARD_HSC_CM01) */
    134134
    135135extern unsigned int BSP_bus_frequency;

  • c/src/lib/libbsp/powerpc/gen83xx/include/hwreg_vals.h

    rc2bc9ef r7a752161  
    3030 * distinguish board characteristics
    3131 */
    32 #if defined(MPC8349EAMDS)
     32#if defined(MPC83XX_BOARD_MPC8349EAMDS)
    3333/*
    3434 * for Freescale MPC8349 EAMDS
    … …  
    7070                          RCWHR_LALE_NORM    |  \
    7171                          RCWHR_LDP_PAR)
    72 #elif defined(HSC_CM01)
     72#elif defined(MPC83XX_BOARD_HSC_CM01)
    7373/*
    7474 * for JPK HSC_CM01
    … …  
    120120#endif
    121121
    122 #if defined(MPC8349EAMDS)
     122#if defined(MPC83XX_BOARD_MPC8349EAMDS)
    123123/**************************
    124  * for Freescale MPC8349EAMDS
     124 * for Freescale MPC83XX_BOARD_MPC8349EAMDS
    125125 */
    126126
    … …  
    175175#define DDR_SDRAM_CLK_CNTL_VAL       0x00000000
    176176
    177 #elif defined(HSC_CM01)
     177#elif defined(MPC83XX_BOARD_HSC_CM01)
    178178/**************************
    179179 * for JPK HSC_CM01

  • c/src/lib/libbsp/powerpc/gen83xx/include/irq.h

    rc2bc9ef r7a752161  
    2525#define GEN83xx_IRQ_IRQ_H
    2626
    27 #include <stdbool.h>
    28 
    2927#include <rtems.h>
    3028#include <rtems/irq.h>
    3129#include <rtems/irq-extension.h>
     30
     31#include <bspopts.h>
    3232
    3333/*
    … …  
    7878 */
    7979  typedef enum {
    80     BSP_IPIC_IRQ_FIRST     = BSP_IPIC_IRQ_LOWEST_OFFSET,
    81     BSP_IPIC_IRQ_ERROR     = BSP_IPIC_IRQ_LOWEST_OFFSET +  0,
    82     /* reserved irqs  1- 8 */
    83     BSP_IPIC_IRQ_UART1     = BSP_IPIC_IRQ_LOWEST_OFFSET +  9,
    84     BSP_IPIC_IRQ_UART2     = BSP_IPIC_IRQ_LOWEST_OFFSET + 10,
    85     BSP_IPIC_IRQ_SEC       = BSP_IPIC_IRQ_LOWEST_OFFSET + 11,
    86     /* reserved irqs 12-13 */
     80    BSP_IPIC_IRQ_FIRST     = BSP_IPIC_IRQ_LOWEST_OFFSET,
     81    BSP_IPIC_IRQ_ERROR     = BSP_IPIC_IRQ_LOWEST_OFFSET +  0,
     82#if MPC83XX_CHIP_TYPE / 10 == 830
     83    BSP_IPIC_IRQ_DMA1      = BSP_IPIC_IRQ_LOWEST_OFFSET +  3,
     84    BSP_IPIC_IRQ_UART      = BSP_IPIC_IRQ_LOWEST_OFFSET +  9,
     85    BSP_IPIC_IRQ_FLEXCAN   = BSP_IPIC_IRQ_LOWEST_OFFSET + 10,
     86#else
     87    BSP_IPIC_IRQ_UART1     = BSP_IPIC_IRQ_LOWEST_OFFSET +  9,
     88    BSP_IPIC_IRQ_UART2     = BSP_IPIC_IRQ_LOWEST_OFFSET + 10,
     89    BSP_IPIC_IRQ_SEC       = BSP_IPIC_IRQ_LOWEST_OFFSET + 11,
     90#endif
    8791    BSP_IPIC_IRQ_I2C1      = BSP_IPIC_IRQ_LOWEST_OFFSET + 14,
    8892    BSP_IPIC_IRQ_I2C2      = BSP_IPIC_IRQ_LOWEST_OFFSET + 15,
    … …  
    9195    BSP_IPIC_IRQ_IRQ2      = BSP_IPIC_IRQ_LOWEST_OFFSET + 18,
    9296    BSP_IPIC_IRQ_IRQ3      = BSP_IPIC_IRQ_LOWEST_OFFSET + 19,
     97#if MPC83XX_CHIP_TYPE / 10 == 830
     98    BSP_IPIC_IRQ_QUICC_HI  = BSP_IPIC_IRQ_LOWEST_OFFSET + 32,
     99    BSP_IPIC_IRQ_QUICC_LO  = BSP_IPIC_IRQ_LOWEST_OFFSET + 33,
     100#else
    93101    BSP_IPIC_IRQ_IRQ4      = BSP_IPIC_IRQ_LOWEST_OFFSET + 20,
    94102    BSP_IPIC_IRQ_IRQ5      = BSP_IPIC_IRQ_LOWEST_OFFSET + 21,
    95103    BSP_IPIC_IRQ_IRQ6      = BSP_IPIC_IRQ_LOWEST_OFFSET + 22,
    96104    BSP_IPIC_IRQ_IRQ7      = BSP_IPIC_IRQ_LOWEST_OFFSET + 23,
    97     /* reserved irqs 24-31 */
    98105    BSP_IPIC_IRQ_TSEC1_TX  = BSP_IPIC_IRQ_LOWEST_OFFSET + 32,
    99106    BSP_IPIC_IRQ_TSEC1_RX  = BSP_IPIC_IRQ_LOWEST_OFFSET + 33,
    … …  
    102109    BSP_IPIC_IRQ_TSEC2_RX  = BSP_IPIC_IRQ_LOWEST_OFFSET + 36,
    103110    BSP_IPIC_IRQ_TSEC2_ERR = BSP_IPIC_IRQ_LOWEST_OFFSET + 37,
     111#endif
    104112    BSP_IPIC_IRQ_USB_DR    = BSP_IPIC_IRQ_LOWEST_OFFSET + 38,
     113#if MPC83XX_CHIP_TYPE / 10 == 830
     114    BSP_IPIC_IRQ_ESDHC     = BSP_IPIC_IRQ_LOWEST_OFFSET + 42,
     115#else
    105116    BSP_IPIC_IRQ_USB_MPH   = BSP_IPIC_IRQ_LOWEST_OFFSET + 39,
    106     /* reserved irqs 40-47 */
     117#endif
    107118    BSP_IPIC_IRQ_IRQ0      = BSP_IPIC_IRQ_LOWEST_OFFSET + 48,
    108     /* reserved irqs 49-63 */
    109119    BSP_IPIC_IRQ_RTC_SEC   = BSP_IPIC_IRQ_LOWEST_OFFSET + 64,
    110120    BSP_IPIC_IRQ_PIT       = BSP_IPIC_IRQ_LOWEST_OFFSET + 65,
    111121    BSP_IPIC_IRQ_PCI1      = BSP_IPIC_IRQ_LOWEST_OFFSET + 66,
     122#if MPC83XX_CHIP_TYPE / 10 == 830
     123    BSP_IPIC_IRQ_MSIR1     = BSP_IPIC_IRQ_LOWEST_OFFSET + 67,
     124#else
    112125    BSP_IPIC_IRQ_PCI2      = BSP_IPIC_IRQ_LOWEST_OFFSET + 67,
     126#endif
    113127    BSP_IPIC_IRQ_RTC_ALR   = BSP_IPIC_IRQ_LOWEST_OFFSET + 68,
    114128    BSP_IPIC_IRQ_MU        = BSP_IPIC_IRQ_LOWEST_OFFSET + 69,
    … …  
    117131    BSP_IPIC_IRQ_GTM4      = BSP_IPIC_IRQ_LOWEST_OFFSET + 72,
    118132    BSP_IPIC_IRQ_GTM8      = BSP_IPIC_IRQ_LOWEST_OFFSET + 73,
     133#if MPC83XX_CHIP_TYPE / 10 == 830
     134    BSP_IPIC_IRQ_QUICC_PORTS = BSP_IPIC_IRQ_LOWEST_OFFSET + 74,
     135    BSP_IPIC_IRQ_GPIO      = BSP_IPIC_IRQ_LOWEST_OFFSET + 75,
     136#else
    119137    BSP_IPIC_IRQ_GPIO1     = BSP_IPIC_IRQ_LOWEST_OFFSET + 74,
    120138    BSP_IPIC_IRQ_GPIO2     = BSP_IPIC_IRQ_LOWEST_OFFSET + 75,
     139#endif
    121140    BSP_IPIC_IRQ_DDR       = BSP_IPIC_IRQ_LOWEST_OFFSET + 76,
    122141    BSP_IPIC_IRQ_LBC       = BSP_IPIC_IRQ_LOWEST_OFFSET + 77,
    … …  
    124143    BSP_IPIC_IRQ_GTM6      = BSP_IPIC_IRQ_LOWEST_OFFSET + 79,
    125144    BSP_IPIC_IRQ_PMC       = BSP_IPIC_IRQ_LOWEST_OFFSET + 80,
    126     /* reserved irqs 81-83 */
     145#if MPC83XX_CHIP_TYPE / 10 == 830
     146    BSP_IPIC_IRQ_MSIR2     = BSP_IPIC_IRQ_LOWEST_OFFSET + 81,
     147    BSP_IPIC_IRQ_MSIR3     = BSP_IPIC_IRQ_LOWEST_OFFSET + 82,
     148#else
    127149    BSP_IPIC_IRQ_GTM3      = BSP_IPIC_IRQ_LOWEST_OFFSET + 84,
    128150    BSP_IPIC_IRQ_GTM7      = BSP_IPIC_IRQ_LOWEST_OFFSET + 85,
    129     /* reserved irqs 86-89 */
     151#endif
     152#if MPC83XX_CHIP_TYPE / 10 == 830
     153    BSP_IPIC_IRQ_MSIR4     = BSP_IPIC_IRQ_LOWEST_OFFSET + 86,
     154    BSP_IPIC_IRQ_MSIR5     = BSP_IPIC_IRQ_LOWEST_OFFSET + 87,
     155    BSP_IPIC_IRQ_MSIR6     = BSP_IPIC_IRQ_LOWEST_OFFSET + 88,
     156    BSP_IPIC_IRQ_MSIR7     = BSP_IPIC_IRQ_LOWEST_OFFSET + 89,
     157#endif
    130158    BSP_IPIC_IRQ_GTM1      = BSP_IPIC_IRQ_LOWEST_OFFSET + 90,
    131159    BSP_IPIC_IRQ_GTM5      = BSP_IPIC_IRQ_LOWEST_OFFSET + 91,
    132     /* reserved irqs 92-127 */
     160#if MPC83XX_CHIP_TYPE / 10 == 830
     161    BSP_IPIC_IRQ_DMA1_ERR  = BSP_IPIC_IRQ_LOWEST_OFFSET + 94,
     162    BSP_IPIC_IRQ_DPTC      = BSP_IPIC_IRQ_LOWEST_OFFSET + 95,
     163#endif
    133164
    134165    BSP_IPIC_IRQ_LAST     = BSP_IPIC_IRQ_MAX_OFFSET,

  • c/src/lib/libbsp/powerpc/gen83xx/make/custom/gen83xx.inc

    rc2bc9ef r7a752161  
    2121# optimize flag: typically -O2
    2222CFLAGS_OPTIMIZE_V = -O2 -g -fno-keep-inline-functions
    23 
    24 LDFLAGS += -qnolinkcmds -T $(RTEMS_LINKCMDS)

  • c/src/lib/libbsp/powerpc/gen83xx/make/custom/hsc_cm01.cfg

    rc2bc9ef r7a752161  
    1010# 
    1111
    12 RTEMS_LINKCMDS=linkcmds.hsc_cm01
    13 
    1412include $(RTEMS_ROOT)/make/custom/gen83xx.inc

  • c/src/lib/libbsp/powerpc/gen83xx/make/custom/mpc8313erdb.cfg

    rc2bc9ef r7a752161  
    88#
    99
    10 RTEMS_LINKCMDS=linkcmds.mpc8313erdb
    11 
    1210include $(RTEMS_ROOT)/make/custom/gen83xx.inc

  • c/src/lib/libbsp/powerpc/gen83xx/make/custom/mpc8349eamds.cfg

    rc2bc9ef r7a752161  
    1010# 
    1111
    12 RTEMS_LINKCMDS=linkcmds.mpc8349eamds
    13 
    1412include $(RTEMS_ROOT)/make/custom/gen83xx.inc

  • c/src/lib/libbsp/powerpc/gen83xx/network/network.c

    rc2bc9ef r7a752161  
    3333#include <libcpu/spr.h>
    3434
     35#if MPC83XX_CHIP_TYPE / 10 != 830
     36
    3537#define TSEC_IFMODE_RGMII 0
    3638#define TSEC_IFMODE_GMII  1
    3739
    38 #if defined( MPC8313ERDB)
     40#if defined( MPC83XX_BOARD_MPC8313ERDB)
    3941
    4042#define TSEC_IFMODE TSEC_IFMODE_RGMII
    4143
    42 #elif defined( MPC8349EAMDS)
     44#elif defined( MPC83XX_BOARD_MPC8349EAMDS)
    4345
    4446#define TSEC_IFMODE TSEC_IFMODE_GMII
    4547
    46 #elif defined( HSC_CM01)
     48#elif defined( MPC83XX_BOARD_HSC_CM01)
    4749
    4850#define TSEC_IFMODE TSEC_IFMODE_RGMII
    … …  
    101103  if (attaching) {
    102104#if (TSEC_IFMODE==TSEC_IFMODE_GMII)
    103 #if !defined(HSC_CM01)
     105#if !defined(MPC83XX_BOARD_HSC_CM01)
    104106
    105107      /*
    … …  
    133135                               |                         0x00087881);
    134136    }
    135 #endif /* !defined(HSC_CM01) */
     137#endif /* !defined(MPC83XX_BOARD_HSC_CM01) */
    136138#endif
    137139#if (TSEC_IFMODE==TSEC_IFMODE_RGMII)
    … …  
    233235   * like this, this should be more configurable
    234236   */
    235 #ifdef MPC8313ERDB
     237#ifdef MPC83XX_BOARD_MPC8313ERDB
    236238  if (unitNumber == 2) {
    237239          tsec_cfg.phy_default = 4;
    … …  
    240242          return 0;
    241243  }
    242 #else /* MPC8313ERDB */
     244#else /* MPC83XX_BOARD_MPC8313ERDB */
    243245  tsec_cfg.phy_default = unitNumber-1;
    244 #endif /* MPC8313ERDB */
     246#endif /* MPC83XX_BOARD_MPC8313ERDB */
    245247
    246248  tsec_cfg.unit_number = unitNumber;
    … …  
    252254  return tsec_driver_attach_detach(config, attaching);
    253255}
     256
     257#endif /* MPC83XX_CHIP_TYPE / 10 != 830 */

  • c/src/lib/libbsp/powerpc/gen83xx/preinstall.am

    rc2bc9ef r7a752161  
    7878PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.base
    7979
     80$(PROJECT_LIB)/linkcmds.mpc8309som: startup/linkcmds.mpc8309som $(PROJECT_LIB)/$(dirstamp)
     81        $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc8309som
     82PREINSTALL_FILES += $(PROJECT_LIB)/linkcmds.mpc8309som
     83
    8084$(PROJECT_LIB)/linkcmds.mpc8313erdb: startup/linkcmds.mpc8313erdb $(PROJECT_LIB)/$(dirstamp)
    8185        $(INSTALL_DATA) $< $(PROJECT_LIB)/linkcmds.mpc8313erdb

  • c/src/lib/libbsp/powerpc/gen83xx/spi/spi_init.c

    rc2bc9ef r7a752161  
    2727#include <bsp.h>
    2828
    29 #if defined( MPC8313ERDB)
     29#if defined( MPC83XX_BOARD_MPC8313ERDB)
    3030
    3131#include <libchip/spi-sd-card.h>
    3232
    33 #elif defined( MPC8349EAMDS)
     33#elif defined( MPC83XX_BOARD_MPC8349EAMDS)
    3434
    3535#include <libchip/spi-flash-m25p40.h>
    3636
    37 #elif defined( HSC_CM01)
     37#elif defined( MPC83XX_BOARD_HSC_CM01)
    3838
    3939#include <libchip/spi-fram-fm25l256.h>
    … …  
    7070{
    7171
    72 #if defined( MPC8313ERDB)
     72#if defined( MPC83XX_BOARD_MPC8313ERDB)
    7373
    7474  /* Check address */
    … …  
    8080  mpc83xx.gpio [0].gpdat &= ~0x20000000;
    8181
    82 #elif defined( MPC8349EAMDS)
     82#elif defined( MPC83XX_BOARD_MPC8349EAMDS)
    8383
    8484  /*
    … …  
    9595  mpc83xx.gpio[0].gpdat &= ~(1 << (31- 0));
    9696
    97 #elif defined( HSC_CM01)
     97#elif defined( MPC83XX_BOARD_HSC_CM01)
    9898
    9999  /*
    … …  
    144144{
    145145
    146 #if defined( MPC8313ERDB)
     146#if defined( MPC83XX_BOARD_MPC8313ERDB)
    147147
    148148  /* SCS (inactive high) */
    149149  mpc83xx.gpio [0].gpdat |= 0x20000000;
    150150
    151 #elif defined( MPC8349EAMDS)
     151#elif defined( MPC83XX_BOARD_MPC8349EAMDS)
    152152
    153153  /*
    … …  
    157157  mpc83xx.gpio[0].gpdat |=  (1 << (31- 0));
    158158
    159 #elif defined( HSC_CM01)
     159#elif defined( MPC83XX_BOARD_HSC_CM01)
    160160
    161161  /*
    … …  
    192192#endif
    193193
    194 #if defined( MPC8313ERDB)
     194#if defined( MPC83XX_BOARD_MPC8313ERDB)
    195195
    196196  /* SCS (inactive high) */
    197197  mpc83xx.gpio [0].gpdat |= 0x20000000;
    198198
    199 #elif defined( MPC8349EAMDS)
     199#elif defined( MPC83XX_BOARD_MPC8349EAMDS)
    200200
    201201  /*
    … …  
    206206  mpc83xx.gpio[0].gpdat |=  (1 << (31- 0));
    207207
    208 #elif defined( HSC_CM01)
     208#elif defined( MPC83XX_BOARD_HSC_CM01)
    209209
    210210  /*
    … …  
    249249};
    250250
    251 #ifdef MPC8313ERDB
     251#ifdef MPC83XX_BOARD_MPC8313ERDB
    252252
    253253#include <libchip/spi-sd-card.h>
    … …  
    275275};
    276276
    277 #endif /* MPC8313ERDB */
     277#endif /* MPC83XX_BOARD_MPC8313ERDB */
    278278
    279279
    … …  
    313313   */
    314314
    315 #if defined( MPC8313ERDB)
     315#if defined( MPC83XX_BOARD_MPC8313ERDB)
    316316
    317317  /*
    … …  
    337337  /* mpc83xx.gpio [0].gpdr  |= 0x0000000f; */
    338338
    339 #elif defined( MPC8349EAMDS)
     339#elif defined( MPC83XX_BOARD_MPC8349EAMDS)
    340340
    341341  /*
    … …  
    347347  mpc83xx.gpio[0].gpdr  &= ~(1 << (31- 0));
    348348
    349 #elif defined( HSC_CM01)
     349#elif defined( MPC83XX_BOARD_HSC_CM01)
    350350
    351351  /*
    … …  
    377377  spi_busno = (unsigned) ret_code;
    378378
    379 #if defined( MPC8313ERDB)
     379#if defined( MPC83XX_BOARD_MPC8313ERDB)
    380380
    381381  /* Register SD Card driver */
    … …  
    386386  }
    387387
    388 #elif defined( MPC8349EAMDS)
     388#elif defined( MPC83XX_BOARD_MPC8349EAMDS)
    389389
    390390  /*
    … …  
    394394                                       spi_flash_m25p40_rw_driver_descriptor,
    395395                                       spi_busno,0x00);
    396 #elif defined(HSC_CM01)
     396#elif defined(MPC83XX_BOARD_HSC_CM01)
    397397
    398398  /*

  • c/src/lib/libbsp/powerpc/gen83xx/startup/cpuinit.c

    rc2bc9ef r7a752161  
    261261  SET_DBAT( 2, dbat.batu, dbat.batl);
    262262
    263 #if defined(HSC_CM01)
     263#if defined(MPC83XX_BOARD_HSC_CM01)
    264264  calc_dbat_regvals(
    265265    &dbat,
    … …  
    275275#endif
    276276
    277 #ifdef MPC8313ERDB
     277#ifdef MPC83XX_BOARD_MPC8313ERDB
    278278  /* Enhanced Local Bus Controller (eLBC) */
    279279  calc_dbat_regvals(
    … …  
    288288  );
    289289  SET_DBAT( 3, dbat.batu, dbat.batl);
    290 #endif /* MPC8313ERDB */
     290#endif /* MPC83XX_BOARD_MPC8313ERDB */
    291291
    292292  /* Read MSR */
Note: See TracChangeset for help on using the changeset viewer.