cpu/nrf51/2: unified erase reg in vendor header

RIOT-OS · Nov 30, 2016 · fe1d4bf · fe1d4bf
1 parent df19605
commit fe1d4bf
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/cpu/nrf51/include/nrf51.h b/cpu/nrf51/include/nrf51.h
@@ -1073,11 +1073,7 @@ typedef struct {                                    /*!< NVMC Structure
   __I  uint32_t  READY;                             /*!< Ready flag.                                                           */
   __I  uint32_t  RESERVED1[64];
   __IO uint32_t  CONFIG;                            /*!< Configuration register.                                               */
-
-  union {
-    __IO uint32_t  ERASEPCR1;                       /*!< Register for erasing a non-protected non-volatile memory page.        */
-    __IO uint32_t  ERASEPAGE;                       /*!< Register for erasing a non-protected non-volatile memory page.        */
-  } nrf51_unnamed1;
+  __IO uint32_t  ERASEPAGE;                       /*!< Register for erasing a non-protected non-volatile memory page.        */
   __IO uint32_t  ERASEALL;                          /*!< Register for erasing all non-volatile user memory.                    */
   __IO uint32_t  ERASEPCR0;                         /*!< Register for erasing a protected non-volatile memory page.            */
   __IO uint32_t  ERASEUICR;                         /*!< Register for start erasing User Information Congfiguration Registers. */

diff --git a/cpu/nrf52/include/nrf52.h b/cpu/nrf52/include/nrf52.h
@@ -2307,14 +2307,7 @@ typedef struct {                                    /*!< NVMC Structure
     __I  uint32_t  RESERVED1[64];
     __IO uint32_t
     CONFIG;                            /*!< Configuration register                                                */
-
-    union {
-        __IO uint32_t
-        ERASEPCR1;                       /*!< Deprecated register - Register for erasing a page in Code area.
-                                                         Equivalent to ERASEPAGE.                                              */
-        __IO uint32_t
-        ERASEPAGE;                       /*!< Register for erasing a page in Code area                              */
-    };
+    __IO uint32_t ERASEPAGE;           /*!< Register for erasing a page in Code area                              */
     __IO uint32_t
     ERASEALL;                          /*!< Register for erasing all non-volatile user memory                     */
     __IO uint32_t