forked from Imagelibrary/rtems
bsps/motorola_powerpc: Change defines from BSP names to avoid clash
- Change mvme2100 to mot_pcc_mvme2100 to avoid clashing with the RTEMS_BSP value for the BSP. You cannot have a define that is the BSP name.
This commit is contained in:
@@ -98,7 +98,7 @@ static rtems_irq_prio irqPrioTable[BSP_IRQ_NUMBER]={
|
||||
};
|
||||
|
||||
#if BSP_PCI_IRQ_NUMBER > 0
|
||||
#if defined(mvme2100)
|
||||
#if defined(mot_ppc_mvme2100)
|
||||
static unsigned char mvme2100_openpic_initpolarities[16] = {
|
||||
0, /* Not used - should be disabled */
|
||||
0, /* DEC21143 Controller */
|
||||
@@ -276,7 +276,7 @@ loop_exit:
|
||||
*/
|
||||
void BSP_rtems_irq_mng_init(unsigned cpuId)
|
||||
{
|
||||
#if BSP_ISA_IRQ_NUMBER > 0 && !defined(mvme2100)
|
||||
#if BSP_ISA_IRQ_NUMBER > 0 && !defined(mot_ppc_mvme2100)
|
||||
int known_cpi_isa_bridge = 0;
|
||||
#endif
|
||||
int i;
|
||||
@@ -285,7 +285,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)
|
||||
/*
|
||||
* First initialize the Interrupt management hardware
|
||||
*/
|
||||
#if defined(mvme2100)
|
||||
#if defined(mot_ppc_mvme2100)
|
||||
#ifdef TRACE_IRQ_INIT
|
||||
printk("Going to initialize EPIC interrupt controller (openpic compliant)\n");
|
||||
#endif
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
extern const pci_config_access_functions pci_direct_functions;
|
||||
extern const pci_config_access_functions pci_indirect_functions;
|
||||
|
||||
#if defined(mvme2100)
|
||||
#if defined(mot_ppc_mvme2100)
|
||||
/* FIXME - this should really be in a separate file - the 2100 doesn't
|
||||
* have a raven chip so there is no point having 2100 code here
|
||||
*/
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include <libchip/m48t08.h>
|
||||
|
||||
/* Forward function declaration */
|
||||
#if !defined(mvme2100)
|
||||
#if !defined(mot_ppc_mvme2100)
|
||||
uint32_t mvmertc_get_register( uintptr_t, uint8_t );
|
||||
void mvmertc_set_register( uintptr_t, uint8_t, uint32_t );
|
||||
#endif
|
||||
@@ -24,7 +24,7 @@ rtc_tbl RTC_Table[] = {
|
||||
&m48t08_fns, /* pDeviceFns */
|
||||
rtc_probe, /* deviceProbe */
|
||||
NULL, /* pDeviceParams */
|
||||
#if defined(mvme2100)
|
||||
#if defined(mot_ppc_mvme2100)
|
||||
0xFFE81ff8, /* ulCtrlPort1 */
|
||||
0x00, /* ulDataPort */
|
||||
m48t08_get_register, /* getRegister */
|
||||
@@ -44,7 +44,7 @@ rtc_tbl RTC_Table[] = {
|
||||
|
||||
size_t RTC_Count = NUM_RTCS;
|
||||
|
||||
#if !defined(mvme2100)
|
||||
#if !defined(mot_ppc_mvme2100)
|
||||
#include <rtems/bspIo.h>
|
||||
void mvmertc_set_register(
|
||||
uintptr_t base,
|
||||
|
||||
Reference in New Issue
Block a user