<div dir="auto"><div><br><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, Apr 11, 2023, 12:00 AM <<a href="mailto:chrisj@rtems.org">chrisj@rtems.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Chris Johns <<a href="mailto:chrisj@rtems.org" target="_blank" rel="noreferrer">chrisj@rtems.org</a>><br>
<br>
- Change mvme2100 to mot_pcc_mvme2100 to avoid clashing with the<br>
RTEMS_BSP value for the BSP. You cannot have a define that is the<br>
BSP name.<br>
---<br>
bsps/mips/include/bsp/i8259.h | 4 ++--<br>
bsps/powerpc/motorola_powerpc/include/bsp.h | 6 +++---<br>
bsps/powerpc/motorola_powerpc/include/bsp/VMEConfig.h | 2 +-<br>
bsps/powerpc/motorola_powerpc/include/bsp/irq.h | 2 +-<br>
bsps/powerpc/motorola_powerpc/start/bspreset.c | 2 +-<br>
bsps/powerpc/motorola_powerpc/start/bspstart.c | 10 +++++-----<br>
bsps/powerpc/motorola_powerpc/start/motorola.c | 2 +-<br>
bsps/powerpc/shared/irq/irq_init.c | 6 +++---<br>
bsps/powerpc/shared/pci/detect_raven_bridge.c | 2 +-<br>
bsps/powerpc/shared/rtc/todcfg.c | 6 +++---<br>
.../bsps/powerpc/motorola_powerpc/optmvme2100.yml | 2 +-<br>
.../bsps/powerpc/motorola_powerpc/optmvme2307.yml | 2 +-<br>
.../bsps/powerpc/motorola_powerpc/optmvme2700.yml | 2 +-<br>
13 files changed, 24 insertions(+), 24 deletions(-)<br>
<br>
diff --git a/bsps/mips/include/bsp/i8259.h b/bsps/mips/include/bsp/i8259.h<br>
index 1a947829b0..29e3853874 100644<br>
--- a/bsps/mips/include/bsp/i8259.h<br>
+++ b/bsps/mips/include/bsp/i8259.h<br>
@@ -37,7 +37,7 @@<br>
* @{<br>
*/<br></blockquote></div></div><div dir="auto"><br></div><div dir="auto">This patch looks ok except for this if 1. It appears it was already there but you touched it. Any explanation? Can the if 1 be removed? </div><div dir="auto"><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
-#if 1 <br>
+#if 1<br>
#define ISA8259_M_ELCR 0x4d0<br>
#define ISA8259_S_ELCR 0x4d1<br>
#endif<br>
@@ -169,7 +169,7 @@ extern "C" {<br>
<br>
/** @} */<br>
<br>
-#if defined(mvme2100)<br>
+#if defined(mot_ppc_mvme2100)<br>
#define BSP_DEC21143_IRQ (BSP_PCI_IRQ_LOWEST_OFFSET + 1)<br>
#define BSP_PMC_PCMIP_TYPE1_SLOT0_IRQ (BSP_PCI_IRQ_LOWEST_OFFSET + 2)<br>
#define BSP_PCMIP_TYPE1_SLOT1_IRQ (BSP_PCI_IRQ_LOWEST_OFFSET + 3)<br>
diff --git a/bsps/powerpc/motorola_powerpc/include/bsp.h b/bsps/powerpc/motorola_powerpc/include/bsp.h<br>
index db0995fa5c..d44bcd5cff 100644<br>
--- a/bsps/powerpc/motorola_powerpc/include/bsp.h<br>
+++ b/bsps/powerpc/motorola_powerpc/include/bsp.h<br>
@@ -89,7 +89,7 @@ extern "C" {<br>
*/<br>
<br>
/* fundamental addresses for BSP (CHRPxxx and PREPxxx are from libcpu/io.h) */<br>
-#if defined(mvme2100)<br>
+#if defined(mot_ppc_mvme2100)<br>
#define _IO_BASE CHRP_ISA_IO_BASE<br>
#define _ISA_MEM_BASE CHRP_ISA_MEM_BASE<br>
/* address of our ram on the PCI bus */<br>
@@ -154,7 +154,7 @@ extern "C" {<br>
* find out what it is which is VERY different from other Motorola boards.<br>
*/<br>
<br>
-#if defined(mvme2100)<br>
+#if defined(mot_ppc_mvme2100)<br>
#define BSP_UART_IOBASE_COM1 ((_IO_BASE)+0x01e10000)<br>
/* #define BSP_UART_IOBASE_COM1 (0xffe10000) */<br>
#define BSP_OPEN_PIC_BASE_OFFSET 0x40000<br>
@@ -169,7 +169,7 @@ extern "C" {<br>
#define BSP_VGA_IOBASE ((_IO_BASE)+0x3c0)<br>
#endif<br>
<br>
-#if defined(mvme2300) || defined(mvme2307) || defined(mvme2700)<br>
+#if defined(mvme2300) || defined(mot_ppc_mvme2307) || defined(mot_ppc_mvme2700)<br>
#define MVME_HAS_DEC21140<br>
#endif<br>
#endif<br>
diff --git a/bsps/powerpc/motorola_powerpc/include/bsp/VMEConfig.h b/bsps/powerpc/motorola_powerpc/include/bsp/VMEConfig.h<br>
index 9b355819f1..9e57730d60 100644<br>
--- a/bsps/powerpc/motorola_powerpc/include/bsp/VMEConfig.h<br>
+++ b/bsps/powerpc/motorola_powerpc/include/bsp/VMEConfig.h<br>
@@ -66,7 +66,7 @@<br>
* available and unused!<br>
*/<br>
<br>
-#if defined(mvme2100)<br>
+#if defined(mot_ppc_mvme2100)<br>
#define _VME_A32_WIN0_ON_PCI 0x90000000<br>
#define _VME_A24_ON_PCI 0x9f000000<br>
#define _VME_A16_ON_PCI 0x9fff0000<br>
diff --git a/bsps/powerpc/motorola_powerpc/include/bsp/irq.h b/bsps/powerpc/motorola_powerpc/include/bsp/irq.h<br>
index fea2859c3e..74bda323eb 100644<br>
--- a/bsps/powerpc/motorola_powerpc/include/bsp/irq.h<br>
+++ b/bsps/powerpc/motorola_powerpc/include/bsp/irq.h<br>
@@ -133,7 +133,7 @@ extern "C" {<br>
#define BSP_PCI_ISA_BRIDGE_IRQ (BSP_PCI_IRQ0)<br>
#endif<br>
<br>
-#if defined(mvme2100)<br>
+#if defined(mot_ppc_mvme2100)<br>
#define BSP_DEC21143_IRQ (BSP_PCI_IRQ_LOWEST_OFFSET + 1)<br>
#define BSP_PMC_PCMIP_TYPE1_SLOT0_IRQ (BSP_PCI_IRQ_LOWEST_OFFSET + 2)<br>
#define BSP_PCMIP_TYPE1_SLOT1_IRQ (BSP_PCI_IRQ_LOWEST_OFFSET + 3)<br>
diff --git a/bsps/powerpc/motorola_powerpc/start/bspreset.c b/bsps/powerpc/motorola_powerpc/start/bspreset.c<br>
index 0931badae4..d0af42284f 100644<br>
--- a/bsps/powerpc/motorola_powerpc/start/bspreset.c<br>
+++ b/bsps/powerpc/motorola_powerpc/start/bspreset.c<br>
@@ -16,7 +16,7 @@ void bsp_reset(void)<br>
CPU_print_stack();<br>
/* shutdown and reboot */<br>
<br>
-#if defined(mvme2100)<br>
+#if defined(mot_ppc_mvme2100)<br>
*(unsigned char*)0xffe00000 |= 0x80;<br>
#else<br>
/* Memory-mapped Port 92 PIB device access<br>
diff --git a/bsps/powerpc/motorola_powerpc/start/bspstart.c b/bsps/powerpc/motorola_powerpc/start/bspstart.c<br>
index a781297565..894cf9d73d 100644<br>
--- a/bsps/powerpc/motorola_powerpc/start/bspstart.c<br>
+++ b/bsps/powerpc/motorola_powerpc/start/bspstart.c<br>
@@ -109,7 +109,7 @@ char *save_boot_params(<br>
return loaderParam;<br>
}<br>
<br>
-#if defined(mvme2100)<br>
+#if defined(mot_ppc_mvme2100)<br>
unsigned int EUMBBAR;<br>
<br>
/*<br>
@@ -130,7 +130,7 @@ uint32_t _CPU_Counter_frequency(void)<br>
<br>
static void bsp_early( void )<br>
{<br>
-#if !defined(mvme2100)<br>
+#if !defined(mot_ppc_mvme2100)<br>
unsigned l2cr;<br>
#endif<br>
prep_t boardManufacturer;<br>
@@ -149,7 +149,7 @@ static void bsp_early( void )<br>
* Init MMU block address translation to enable hardware access<br>
*/<br>
<br>
-#if !defined(mvme2100)<br>
+#if !defined(mot_ppc_mvme2100)<br>
/*<br>
* PC legacy IO space used for inb/outb and all PC compatible hardware<br>
*/<br>
@@ -173,7 +173,7 @@ static void bsp_early( void )<br>
setdbat(3, 0xb0000000, 0xb0000000, 0x10000000, IO_PAGE);<br>
#endif<br>
<br>
-#if defined(mvme2100)<br>
+#if defined(mot_ppc_mvme2100)<br>
/* Need 0xfec00000 mapped for this */<br>
EUMBBAR = get_eumbbar();<br>
#endif<br>
@@ -200,7 +200,7 @@ static void bsp_early( void )<br>
#endif<br>
<br>
<br>
-#if !defined(mvme2100)<br>
+#if !defined(mot_ppc_mvme2100)<br>
/*<br>
* Enable L2 Cache. Note that the set_L2CR(L2CR) codes checks for<br>
* relevant CPU type (mpc750)...<br>
diff --git a/bsps/powerpc/motorola_powerpc/start/motorola.c b/bsps/powerpc/motorola_powerpc/start/motorola.c<br>
index 25b1d3aa3c..58c711f07b 100644<br>
--- a/bsps/powerpc/motorola_powerpc/start/motorola.c<br>
+++ b/bsps/powerpc/motorola_powerpc/start/motorola.c<br>
@@ -368,7 +368,7 @@ motorolaBoard getMotorolaBoard(void)<br>
*<br>
* NOTE: Every path must set currentBoard.<br>
*/<br>
-#if defined(mvme2100)<br>
+#if defined(mot_ppc_mvme2100)<br>
currentBoard = (motorolaBoard) MVME_2100;<br>
#else<br>
unsigned char cpu_type;<br>
diff --git a/bsps/powerpc/shared/irq/irq_init.c b/bsps/powerpc/shared/irq/irq_init.c<br>
index 233c659b85..ecbff9bb19 100644<br>
--- a/bsps/powerpc/shared/irq/irq_init.c<br>
+++ b/bsps/powerpc/shared/irq/irq_init.c<br>
@@ -98,7 +98,7 @@ static rtems_irq_prio irqPrioTable[BSP_IRQ_NUMBER]={<br>
};<br>
<br>
#if BSP_PCI_IRQ_NUMBER > 0<br>
-#if defined(mvme2100)<br>
+#if defined(mot_ppc_mvme2100)<br>
static unsigned char mvme2100_openpic_initpolarities[16] = {<br>
0, /* Not used - should be disabled */<br>
0, /* DEC21143 Controller */<br>
@@ -276,7 +276,7 @@ loop_exit:<br>
*/<br>
void BSP_rtems_irq_mng_init(unsigned cpuId)<br>
{<br>
-#if BSP_ISA_IRQ_NUMBER > 0 && !defined(mvme2100)<br>
+#if BSP_ISA_IRQ_NUMBER > 0 && !defined(mot_ppc_mvme2100)<br>
int known_cpi_isa_bridge = 0;<br>
#endif<br>
int i;<br>
@@ -285,7 +285,7 @@ void BSP_rtems_irq_mng_init(unsigned cpuId)<br>
/*<br>
* First initialize the Interrupt management hardware<br>
*/<br>
-#if defined(mvme2100)<br>
+#if defined(mot_ppc_mvme2100)<br>
#ifdef TRACE_IRQ_INIT<br>
printk("Going to initialize EPIC interrupt controller (openpic compliant)\n");<br>
#endif<br>
diff --git a/bsps/powerpc/shared/pci/detect_raven_bridge.c b/bsps/powerpc/shared/pci/detect_raven_bridge.c<br>
index 0a1c04a2e2..a3f03e0acd 100644<br>
--- a/bsps/powerpc/shared/pci/detect_raven_bridge.c<br>
+++ b/bsps/powerpc/shared/pci/detect_raven_bridge.c<br>
@@ -30,7 +30,7 @@<br>
extern const pci_config_access_functions pci_direct_functions;<br>
extern const pci_config_access_functions pci_indirect_functions;<br>
<br>
-#if defined(mvme2100)<br>
+#if defined(mot_ppc_mvme2100)<br>
/* FIXME - this should really be in a separate file - the 2100 doesn't<br>
* have a raven chip so there is no point having 2100 code here<br>
*/<br>
diff --git a/bsps/powerpc/shared/rtc/todcfg.c b/bsps/powerpc/shared/rtc/todcfg.c<br>
index 17ef18d5b5..95d75216a2 100644<br>
--- a/bsps/powerpc/shared/rtc/todcfg.c<br>
+++ b/bsps/powerpc/shared/rtc/todcfg.c<br>
@@ -11,7 +11,7 @@<br>
#include <libchip/m48t08.h><br>
<br>
/* Forward function declaration */<br>
-#if !defined(mvme2100)<br>
+#if !defined(mot_ppc_mvme2100)<br>
uint32_t mvmertc_get_register( uintptr_t, uint8_t );<br>
void mvmertc_set_register( uintptr_t, uint8_t, uint32_t );<br>
#endif<br>
@@ -24,7 +24,7 @@ rtc_tbl RTC_Table[] = {<br>
&m48t08_fns, /* pDeviceFns */<br>
rtc_probe, /* deviceProbe */<br>
NULL, /* pDeviceParams */<br>
-#if defined(mvme2100)<br>
+#if defined(mot_ppc_mvme2100)<br>
0xFFE81ff8, /* ulCtrlPort1 */<br>
0x00, /* ulDataPort */<br>
m48t08_get_register, /* getRegister */<br>
@@ -44,7 +44,7 @@ rtc_tbl RTC_Table[] = {<br>
<br>
size_t RTC_Count = NUM_RTCS;<br>
<br>
-#if !defined(mvme2100)<br>
+#if !defined(mot_ppc_mvme2100)<br>
#include <rtems/bspIo.h><br>
void mvmertc_set_register(<br>
uintptr_t base,<br>
diff --git a/spec/build/bsps/powerpc/motorola_powerpc/optmvme2100.yml b/spec/build/bsps/powerpc/motorola_powerpc/optmvme2100.yml<br>
index 5214a4c0fe..11aee65314 100644<br>
--- a/spec/build/bsps/powerpc/motorola_powerpc/optmvme2100.yml<br>
+++ b/spec/build/bsps/powerpc/motorola_powerpc/optmvme2100.yml<br>
@@ -14,5 +14,5 @@ description: |<br>
Defined for MVME2100 -- undefined for others<br>
enabled-by: true<br>
links: []<br>
-name: mvme2100<br>
+name: mot_ppc_mvme2100<br>
type: build<br>
diff --git a/spec/build/bsps/powerpc/motorola_powerpc/optmvme2307.yml b/spec/build/bsps/powerpc/motorola_powerpc/optmvme2307.yml<br>
index da417b9c9b..351b8e2d72 100644<br>
--- a/spec/build/bsps/powerpc/motorola_powerpc/optmvme2307.yml<br>
+++ b/spec/build/bsps/powerpc/motorola_powerpc/optmvme2307.yml<br>
@@ -14,5 +14,5 @@ description: |<br>
Defined for MVME2307 -- undefined for others<br>
enabled-by: true<br>
links: []<br>
-name: mvme2307<br>
+name: mot_ppc_mvme2307<br>
type: build<br>
diff --git a/spec/build/bsps/powerpc/motorola_powerpc/optmvme2700.yml b/spec/build/bsps/powerpc/motorola_powerpc/optmvme2700.yml<br>
index 5b968bd1f0..5df50c6858 100644<br>
--- a/spec/build/bsps/powerpc/motorola_powerpc/optmvme2700.yml<br>
+++ b/spec/build/bsps/powerpc/motorola_powerpc/optmvme2700.yml<br>
@@ -14,5 +14,5 @@ description: |<br>
Defined for MVME2700 -- undefined for others<br>
enabled-by: true<br>
links: []<br>
-name: mvme2700<br>
+name: mot_ppc_mvme2700<br>
type: build<br>
-- <br>
2.37.1<br>
<br>
_______________________________________________<br>
devel mailing list<br>
<a href="mailto:devel@rtems.org" target="_blank" rel="noreferrer">devel@rtems.org</a><br>
<a href="http://lists.rtems.org/mailman/listinfo/devel" rel="noreferrer noreferrer" target="_blank">http://lists.rtems.org/mailman/listinfo/devel</a><br>
</blockquote></div></div></div>