[rtems commit] bsp/rtl22xx: Add prefix due to name conflicts

Sebastian Huber sebh at rtems.org
Fri Mar 20 08:46:07 UTC 2015


Module:    rtems
Branch:    master
Commit:    9f34aa5e06730a88e2be9aadcc0a4d6847441d2a
Changeset: http://git.rtems.org/rtems/commit/?id=9f34aa5e06730a88e2be9aadcc0a4d6847441d2a

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Mar 20 09:45:02 2015 +0100

bsp/rtl22xx: Add prefix due to name conflicts

Close #2303.

---

 c/src/lib/libbsp/arm/rtl22xx/include/bsp.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h b/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h
index 5908ed6..be38c8e 100644
--- a/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h
+++ b/c/src/lib/libbsp/arm/rtl22xx/include/bsp.h
@@ -174,13 +174,13 @@ extern "C" {
  * @{
  */
 
-//#define FLASH_SIZE      (0x200000-FLASH_BOOT)   // Total area of Flash region in words 8 bit
+//#define RTL22XX_FLASH_SIZE      (0x200000-RTL22XX_FLASH_BOOT)   // Total area of Flash region in words 8 bit
 /** @brief Total area of Flash region in words 8 bit */
-#define FLASH_SIZE        (0x80000-FLASH_BOOT)
-//#define FLASH_SIZE      (0x80000-FLASH_BOOT)      // Total area of Flash region in words 8 bit
-#define FLASH_BEGIN       0x80000000
+#define RTL22XX_FLASH_SIZE        (0x80000-RTL22XX_FLASH_BOOT)
+//#define RTL22XX_FLASH_SIZE      (0x80000-RTL22XX_FLASH_BOOT)      // Total area of Flash region in words 8 bit
+#define RTL22XX_FLASH_BEGIN       0x80000000
 /** @brief First 0x8000 bytes reserved for boot loader etc. */
-#define FLASH_BASE        (FLASH_BEGIN+FLASH_BOOT)
+#define RTL22XX_FLASH_BASE        (RTL22XX_FLASH_BEGIN+RTL22XX_FLASH_BOOT)
 
 /** @} */
 




More information about the vc mailing list