Update bfin after removing preinstall.

- There are defines in the score and libcpu so header in libcpu have
  been updated to undef any score defines. This should be harmless as
  the values are constants and the same value.

Update #3254.

12 files changed, 39 insertions, 15 deletions

diff --git a/bsps/bfin/include/bf52x.h b/bsps/bfin/include/bf52x.h
index 6c3d087c79..a5fbcfcf08 100644
--- a/bsps/bfin/include/bf52x.h
+++ b/bsps/bfin/include/bf52x.h
@@ -24,6 +24,10 @@
 #ifndef _BF52X_H_
 #define _BF52X_H_
 
+#undef TIMER_ENABLE
+#undef TIMER_DISABLE
+#undef TIMER_STATUS
+
 /* register (or register block) addresses */
 
 #define SIC_BASE_ADDRESS                          0xffc00100
@@ -128,4 +132,3 @@
 #define SIC_IAR_COUNT                                      8
 
 #endif /* _BF52X_H_ */
-
diff --git a/bsps/bfin/include/libcpu/coreTimerRegs.h b/bsps/bfin/include/libcpu/coreTimerRegs.h
index c5b257783c..6ad03c6da3 100644
--- a/bsps/bfin/include/libcpu/coreTimerRegs.h
+++ b/bsps/bfin/include/libcpu/coreTimerRegs.h
@@ -11,6 +11,11 @@
 #ifndef _coreTimerRegs_h_
 #define _coreTimerRegs_h_
 
+#undef TCNTL
+#undef TPERIOD
+#undef TSCALE
+#undef TCOUNT
+
 /* register addresses */
 
 #define TCNTL                                     0xffe03000
diff --git a/bsps/bfin/include/libcpu/ebiuRegs.h b/bsps/bfin/include/libcpu/ebiuRegs.h
index 1a07ff6985..9b68adf061 100644
--- a/bsps/bfin/include/libcpu/ebiuRegs.h
+++ b/bsps/bfin/include/libcpu/ebiuRegs.h
@@ -11,6 +11,14 @@
 #ifndef _ebiuRegs_h_
 #define _ebiuRegs_h_
 
+#undef EBIU_AMGCTL
+#undef EBIU_AMBCTL0
+#undef EBIU_AMBCTL1
+#undef EBIU_SDGCTL
+#undef EBIU_SDBCTL
+#undef EBIU_SDRRC
+#undef EBIU_SDSTAT
+
 /* register addresses */
 
 #define EBIU_AMGCTL             (EBIU_BASE_ADDRESS + 0x0000)
diff --git a/bsps/bfin/include/libcpu/rtcRegs.h b/bsps/bfin/include/libcpu/rtcRegs.h
index 09245c2b91..2de302a1e0 100644
--- a/bsps/bfin/include/libcpu/rtcRegs.h
+++ b/bsps/bfin/include/libcpu/rtcRegs.h
@@ -11,6 +11,13 @@
 #ifndef _rtcRegs_h_
 #define _rtcRegs_h_
 
+#undef RTC_STAT
+#undef RTC_ICTL
+#undef RTC_ISTAT
+#undef RTC_SWCNT
+#undef RTC_ALARM
+#undef RTC_PREN
+
 /* register addresses */
 
 #define RTC_STAT                 (RTC_BASE_ADDRESS + 0x0000)
diff --git a/bsps/bfin/include/libcpu/sicRegs.h b/bsps/bfin/include/libcpu/sicRegs.h
index 79fdd0d77c..ec298eec4e 100644
--- a/bsps/bfin/include/libcpu/sicRegs.h
+++ b/bsps/bfin/include/libcpu/sicRegs.h
@@ -11,6 +11,14 @@
 #ifndef _sicRegs_h_
 #define _sicRegs_h_
 
+#undef SIC_IMASK
+#undef SIC_ISR
+#undef SIC_IAR0
+#undef SIC_IAR1
+#undef SIC_IAR2
+#undef SIC_IAR3
+#undef SIC_IWR
+
 /* register addresses */
 
 #define SIC_IMASK                (SIC_BASE_ADDRESS + 0x000c)
@@ -38,6 +46,4 @@
 
 /* register fields */
 
-
-
 #endif /* _sicRegs_h_ */
diff --git a/c/src/lib/libcpu/bfin/bf52x/interrupt/interrupt.c b/c/src/lib/libcpu/bfin/bf52x/interrupt/interrupt.c
index db7deded33..1b69046453 100644
--- a/c/src/lib/libcpu/bfin/bf52x/interrupt/interrupt.c
+++ b/c/src/lib/libcpu/bfin/bf52x/interrupt/interrupt.c
@@ -28,7 +28,7 @@
 #include <libcpu/cecRegs.h>
 #include <libcpu/sicRegs.h>
 #include <string.h>
-#include "interrupt.h"
+#include <bsp/interrupt.h>
 
 #define SIC_IAR_COUNT_SET0		  4
 #define SIC_IAR_BASE_ADDRESS_0  0xFFC00150
diff --git a/c/src/lib/libcpu/bfin/interrupt/interrupt.c b/c/src/lib/libcpu/bfin/interrupt/interrupt.c
index 5fd3b3d72f..cf6c66e4eb 100644
--- a/c/src/lib/libcpu/bfin/interrupt/interrupt.c
+++ b/c/src/lib/libcpu/bfin/interrupt/interrupt.c
@@ -16,7 +16,7 @@
 #include <libcpu/cecRegs.h>
 #include <libcpu/sicRegs.h>
 #include <string.h>
-#include "interrupt.h"
+#include <bsp/interrupt.h>
 
 
 static struct {
@@ -193,4 +193,3 @@ void bfin_interrupt_enable_global(int source, bool enable) {
     rtems_interrupt_enable(isrLevel);
   }
 }
-
diff --git a/c/src/lib/libcpu/bfin/mmu/mmu.c b/c/src/lib/libcpu/bfin/mmu/mmu.c
index 28b4d86779..b2cfae1955 100644
--- a/c/src/lib/libcpu/bfin/mmu/mmu.c
+++ b/c/src/lib/libcpu/bfin/mmu/mmu.c
@@ -12,7 +12,7 @@
 #include <rtems.h>
 
 #include <libcpu/memoryRegs.h>
-#include "mmu.h"
+#include <libcpu/mmu.h>
 
 /* NOTE: see notes in mmu.h */
 
@@ -41,4 +41,3 @@ void bfin_mmu_init(bfin_mmu_config_t *config) {
   }
   *(uint32_t volatile *) DMEM_CONTROL |= DMEM_CONTROL_ENDCPLB;
 }
-
diff --git a/c/src/lib/libcpu/bfin/network/ethernet.c b/c/src/lib/libcpu/bfin/network/ethernet.c
index 5a34e93876..e609e8ccd8 100644
--- a/c/src/lib/libcpu/bfin/network/ethernet.c
+++ b/c/src/lib/libcpu/bfin/network/ethernet.c
@@ -34,7 +34,7 @@
 
 #include <libcpu/dmaRegs.h>
 #include <libcpu/ethernetRegs.h>
-#include "ethernet.h"
+#include <libcpu/ethernet.h>
 
 #if (BFIN_ETHERNET_DEBUG & BFIN_ETHERNET_DEBUG_DUMP_MBUFS)
 #include <rtems/dumpbuf.h>
@@ -875,4 +875,3 @@ int bfin_ethernet_driver_attach(struct rtems_bsdnet_ifconfig *config,
 
   return 1;
 }
-
diff --git a/c/src/lib/libcpu/bfin/serial/spi.c b/c/src/lib/libcpu/bfin/serial/spi.c
index e47a72629d..153891bac1 100644
--- a/c/src/lib/libcpu/bfin/serial/spi.c
+++ b/c/src/lib/libcpu/bfin/serial/spi.c
@@ -15,7 +15,7 @@
 #include <errno.h>
 #include <rtems/libi2c.h>
 #include <libcpu/spiRegs.h>
-#include "spi.h"
+#include <libcpu/spi.h>
 
 
 #ifndef BFIN_REG16
@@ -237,4 +237,3 @@ int bfin_spi_ioctl(rtems_libi2c_bus_t *bus, int cmd, void *arg) {
 
   return result;
 }
-
diff --git a/c/src/lib/libcpu/bfin/serial/twi.c b/c/src/lib/libcpu/bfin/serial/twi.c
index 3241a3eb30..00cfe02ae9 100644
--- a/c/src/lib/libcpu/bfin/serial/twi.c
+++ b/c/src/lib/libcpu/bfin/serial/twi.c
@@ -15,7 +15,7 @@
 #include <rtems.h>
 
 #include <libcpu/twiRegs.h>
-#include "twi.h"
+#include <libcpu/twi.h>
 
 
 #ifndef N_BFIN_TWI
@@ -250,4 +250,3 @@ rtems_status_code bfin_twi_request(int channel, uint8_t address,
   }
   return result;
 }
-
diff --git a/c/src/lib/libcpu/bfin/serial/uart.c b/c/src/lib/libcpu/bfin/serial/uart.c
index 617c59dab3..18a522e121 100644
--- a/c/src/lib/libcpu/bfin/serial/uart.c
+++ b/c/src/lib/libcpu/bfin/serial/uart.c
@@ -18,7 +18,7 @@
 
 #include <libcpu/uartRegs.h>
 #include <libcpu/dmaRegs.h>
-#include "uart.h"
+#include <libcpu/uart.h>
 
 /* flags */
 #define BFIN_UART_XMIT_BUSY 0x01