imx233: generate register headers using headergen_v2 and update code for it

NOTE: this commit does not introduce any change, ideally even the binary should
be almost the same. I checked the disassembly by hand and there are only a few
differences here and there, mostly the compiler decides to compile very close
expressions slightly differently. I tried to run the new code on several targets
to make sure and saw no difference.

The major syntax changes of the new headers are as follows:
- BF_{WR,SET,CLR} are now superpowerful and allows to set several fileds at once:
  BF_WR(reg, field1(value1), field2(value2), ...)
- BF_CS (use like BF_WR) does a write to reg_CLR and then reg_SET instead of RMW
- there is no more need for macros like BF_{WR_,SET,CLR}_V, since one can simply
  BF_WR with field_V(name)
- the old BF_SETV macro has no trivial equivalent and is replaced with its
  its equivalent for BF_WR(reg_SET, ...)

I also rename the register headers: "regs/regs-x.h" -> "regs/x.h" to avoid the
redundant "regs".

Final note: the registers were generated using the following command:
./headergen_v2 -g imx -o ../../firmware/target/arm/imx233/regs/ desc/regs-stmp3{600,700,780}.xml

Change-Id: I7485e8b4315a0929a8edb63e7fa1edcaa54b1edc

1 files changed, 4 insertions, 4 deletions

diff --git a/firmware/target/arm/imx233/ocotp-imx233.h b/firmware/target/arm/imx233/ocotp-imx233.h
index 0827ea0d19..ddd7fec228 100644
--- a/firmware/target/arm/imx233/ocotp-imx233.h
+++ b/firmware/target/arm/imx233/ocotp-imx233.h
@@ -28,7 +28,7 @@
  * where STMP3600 has laser fuses. */
 
 #if IMX233_SUBTARGET >= 3700
-#include "regs/regs-ocotp.h"
+#include "regs/ocotp.h"
 
 #define IMX233_NUM_OCOTP_CUST   4
 #define IMX233_NUM_OCOTP_CRYPTO 4
@@ -57,15 +57,15 @@ static inline uint32_t imx233_ocotp_read(volatile uint32_t *reg)
     return val;
 }
 #else
-#include "regs/regs-rtc.h"
+#include "regs/rtc.h"
 
 #define IMX233_NUM_OCOTP_LASERFUSE  12
 
 static inline uint32_t imx233_ocotp_read(volatile uint32_t *reg)
 {
-    BF_WR_V(RTC_UNLOCK, KEY, VAL);
+    BF_WR(RTC_UNLOCK, KEY_V(VAL));
     uint32_t val = *reg;
-    BF_WR(RTC_UNLOCK, KEY, 0);
+    BF_WR(RTC_UNLOCK, KEY(0));
     return val;
 }
 #endif