bsp/mpc5200: Add MPC5200_BOARD prefix

6 files changed, 49 insertions, 27 deletions

diff --git a/c/src/lib/libbsp/powerpc/gen5200/configure.ac b/c/src/lib/libbsp/powerpc/gen5200/configure.ac
index 296d6f1954..373411d9e9 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/configure.ac
+++ b/c/src/lib/libbsp/powerpc/gen5200/configure.ac
@@ -93,24 +93,24 @@ RTEMS_BSPOPTS_SET([PRINTK_MINOR],[dp2],[1])
 RTEMS_BSPOPTS_SET([PRINTK_MINOR],[*],[0])
 RTEMS_BSPOPTS_HELP([PRINTK_MINOR],[console minor number used by printk()])
 
-RTEMS_BSPOPTS_SET([PM520_ZE30],[pm520_ze30],[1])
-RTEMS_BSPOPTS_HELP([PM520_ZE30],
+RTEMS_BSPOPTS_SET([MPC5200_BOARD_PM520_ZE30],[pm520_ze30],[1])
+RTEMS_BSPOPTS_HELP([MPC5200_BOARD_PM520_ZE30],
 [enable settings for PM520 ZE30])
 
-RTEMS_BSPOPTS_SET([PM520_CR825],[pm520_cr825],[1])
-RTEMS_BSPOPTS_HELP([PM520_CR825],
+RTEMS_BSPOPTS_SET([MPC5200_BOARD_PM520_CR825],[pm520_cr825],[1])
+RTEMS_BSPOPTS_HELP([MPC5200_BOARD_PM520_CR825],
 [enable settings for PM520 CR825])
 
-RTEMS_BSPOPTS_SET([icecube],[icecube],[1])
-RTEMS_BSPOPTS_HELP([icecube],
+RTEMS_BSPOPTS_SET([MPC5200_BOARD_ICECUBE],[icecube],[1])
+RTEMS_BSPOPTS_HELP([MPC5200_BOARD_ICECUBE],
 [enable settings for IceCube])
 
-RTEMS_BSPOPTS_SET([BRS5L],[brs5l],[1])
-RTEMS_BSPOPTS_HELP([BRS5L],
+RTEMS_BSPOPTS_SET([MPC5200_BOARD_BRS5L],[brs5l],[1])
+RTEMS_BSPOPTS_HELP([MPC5200_BOARD_BRS5L],
 [enable settings for BRS5L])
 
-RTEMS_BSPOPTS_SET([BSP_TYPE_DP2],[dp2],[1])
-RTEMS_BSPOPTS_HELP([BSP_TYPE_DP2],
+RTEMS_BSPOPTS_SET([MPC5200_BOARD_DP2],[dp2],[1])
+RTEMS_BSPOPTS_HELP([MPC5200_BOARD_DP2],
 [enable settings for DP2])
 
 RTEMS_BSPOPTS_SET([HAS_UBOOT],[pm520*],[1])
diff --git a/c/src/lib/libbsp/powerpc/gen5200/ide/ata.c b/c/src/lib/libbsp/powerpc/gen5200/ide/ata.c
index 8fd1097eb8..54a31d1473 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/ide/ata.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/ide/ata.c
@@ -100,7 +100,7 @@ static bool probe(void)
 {
   bool card_present = true;
 
-#ifdef BRS5L
+#ifdef MPC5200_BOARD_BRS5L
   volatile struct mpc5200_gpt *gpt = &mpc5200.gpt[GPT2];
 
   /* Enable card detection on GPT2 */
diff --git a/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c b/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c
index 1366a6bd4e..60701af33b 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/ide/pcmcia_ide.c
@@ -142,7 +142,7 @@ bool mpc5200_pcmciaide_probe(int minor)
   bool ide_card_plugged = false; /* assume: we don't have a card plugged in */
   struct mpc5200_gpt *gpt = (struct mpc5200_gpt *)(&mpc5200.gpt[GPT2]);
 
-  #ifdef BSP_TYPE_DP2
+  #ifdef MPC5200_BOARD_DP2
     /* Deactivate RESET signal */
     rtems_interrupt_level level;
     rtems_interrupt_disable(level);
@@ -159,7 +159,7 @@ bool mpc5200_pcmciaide_probe(int minor)
   /* enable card detection on GPT2 */
   gpt->emsel = (GPT_EMSEL_GPIO_IN | GPT_EMSEL_TIMER_MS_GPIO);
 
-#if defined (BRS5L)
+#if defined (MPC5200_BOARD_BRS5L)
   /* Check for card detection (-CD0) */
   if((gpt->status) & GPT_STATUS_PIN)
     ide_card_plugged = false;
@@ -641,7 +641,7 @@ int mpc5200_pcmciaide_control(int  minor, uint32_t cmd, void * arg)
 
 void mpc5200_pcmciaide_initialize(int minor)
   {
-#if defined (BRS5L)
+#if defined (MPC5200_BOARD_BRS5L)
   struct mpc5200_gpt *gpt = (struct mpc5200_gpt *)(&mpc5200.gpt[GPT7]);
 
   /* invert ATA reset on GPT7 */
diff --git a/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h b/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h
index fccf453870..0a1f859dba 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h
+++ b/c/src/lib/libbsp/powerpc/gen5200/include/bsp.h
@@ -63,19 +63,37 @@ LINKER_SYMBOL(bsp_work_area_start);
 
 LINKER_SYMBOL(MBAR);
 
+/* Provide legacy defines */
+
+#ifdef MPC5200_BOARD_PM520_ZE30
+#define PM520_ZE30
+#endif
+
+#ifdef MPC5200_BOARD_PM520_CR825
+#define PM520_CR825
+#endif
+
+#ifdef MPC5200_BOARD_ICECUBE
+#define icecube
+#endif
+
+#ifdef MPC5200_BOARD_BRS5L
+#define BRS5L
+#endif
+
 /*
  * distinguish board characteristics
  */
 /*
  * for PM520 mdule on a ZE30 carrier
  */
-#if defined(PM520_ZE30)
+#if defined(MPC5200_BOARD_PM520_ZE30)
 #define PM520
 #endif
 /*
  * for PM520 mdule on a CR825 carrier
  */
-#if defined(PM520_CR825)
+#if defined(MPC5200_BOARD_PM520_CR825)
 #define PM520
 #endif
 
@@ -84,7 +102,7 @@ LINKER_SYMBOL(MBAR);
   #define NEED_LOW_LEVEL_INIT
 #endif
 
-#if defined(BRS5L)
+#if defined(MPC5200_BOARD_BRS5L)
 /*
  * IMD Custom Board BRS5L
  */
@@ -93,7 +111,9 @@ LINKER_SYMBOL(MBAR);
 
 #elif defined (PM520)
 
-#elif defined (icecube)
+/* Nothing special */
+
+#elif defined (MPC5200_BOARD_ICECUBE)
 /*
  *  Codename: IceCube
  *  Compatible Boards:
@@ -101,7 +121,9 @@ LINKER_SYMBOL(MBAR);
  *     Embedded Planet EP5200
  */
 
-#elif defined (BSP_TYPE_DP2)
+#elif defined (MPC5200_BOARD_DP2)
+
+/* Nothing special */
 
 #else
 #error "board type not defined"
@@ -171,7 +193,7 @@ extern int rtems_mpc5200_fec_driver_attach_detach (struct rtems_bsdnet_ifconfig
 #define IPB_CLOCK (bsp_uboot_board_info.bi_ipbfreq)
 #define XLB_CLOCK (bsp_uboot_board_info.bi_busfreq)
 #define G2_CLOCK  (bsp_uboot_board_info.bi_intfreq)
-#elif defined(BRS5L)
+#elif defined(MPC5200_BOARD_BRS5L)
 #define IPB_CLOCK 66000000   /* 66 MHz */
 #define XLB_CLOCK 132000000  /* 132 MHz */
 #define G2_CLOCK  396000000  /* 396 MHz */
diff --git a/c/src/lib/libbsp/powerpc/gen5200/start/start.S b/c/src/lib/libbsp/powerpc/gen5200/start/start.S
index d303fe3637..1dbdc624ec 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/start/start.S
+++ b/c/src/lib/libbsp/powerpc/gen5200/start/start.S
@@ -292,12 +292,12 @@ start:
 
 
 
-#ifdef BRS5L
+#ifdef MPC5200_BOARD_BRS5L
 	LWI	r30, CSBOOTROM_VAL
 	stw	r30, CSBOOTROM(r31)	 	/* Set CSBOOTROM */
 
 
-#endif /* BRS5L */
+#endif /* MPC5200_BOARD_BRS5L */
 
 
 	/* FIXME: map BOOT ROM into final location with CS0 registers */
@@ -489,7 +489,7 @@ twiddle:
 
 #if defined(NEED_LOW_LEVEL_INIT)
 SDRAM_init:
-#if defined(BRS5L)
+#if defined(MPC5200_BOARD_BRS5L)
       /* set GPIO_WKUP7 pin low for 66MHz buffering */
       /* or high for 133MHz registered buffering    */
 	LWI	r30, 0x80000000
@@ -537,7 +537,7 @@ SDRAM_init:
 	LWI	r30, 0xCCC70004			/* Burst2Read Prec.delay=0x8, Burst Write delay=0x8 */ 
 	stw	r30, CFG2(r31)			/* Burst Read2Write delay=0xB, Burst length=0x7, Read Tap=0x4 */
 
-#ifdef BRS5L
+#ifdef MPC5200_BOARD_BRS5L
 	LWI	r30, 0xD1470000 		/* Mode Set enabled, Clock enabled, Auto refresh enabled, Mem. data drv */
 	stw	r30, CTRL(r31)			/* Refresh counter=0xFFFF */
 
diff --git a/c/src/lib/libbsp/powerpc/gen5200/startup/cpuinit.c b/c/src/lib/libbsp/powerpc/gen5200/startup/cpuinit.c
index e72f4f7cae..bd43309316 100644
--- a/c/src/lib/libbsp/powerpc/gen5200/startup/cpuinit.c
+++ b/c/src/lib/libbsp/powerpc/gen5200/startup/cpuinit.c
@@ -114,7 +114,7 @@ static void calc_dbat_regvals(
 
 static void cpu_init_bsp(void)
 {
-#if defined (BRS5L)
+#if defined (MPC5200_BOARD_BRS5L)
   BAT dbat;
 
   calc_dbat_regvals(
@@ -251,7 +251,7 @@ static void cpu_init_bsp(void)
 #warning "Using BAT register values set by environment"
 #endif
 
-#if defined(BSP_TYPE_DP2)
+#if defined(MPC5200_BOARD_DP2)
   /* Enable BAT4-7 */
   PPC_SET_SPECIAL_PURPOSE_REGISTER_BITS(HID2, BSP_BBIT32(13));
 
@@ -267,7 +267,7 @@ static void cpu_init_bsp(void)
     BPP_RW
   );
   SET_DBAT(4, dbat.batu, dbat.batl);
-#elif defined(PM520_ZE30)
+#elif defined(MPC5200_BOARD_PM520_ZE30)
   /* Enable BAT4-7 */
   PPC_SET_SPECIAL_PURPOSE_REGISTER_BITS(HID2, BSP_BBIT32(13));