diff --git a/firmware/blinky/blinky.c b/firmware/blinky/blinky.c
index 2c0c0011..51c2f293 100644
--- a/firmware/blinky/blinky.c
+++ b/firmware/blinky/blinky.c
@@ -24,7 +24,7 @@
 
 #include "hackrf_core.h"
 
-u32 boot0, boot1, boot2, boot3;
+uint32_t boot0, boot1, boot2, boot3;
 
 int main(void)
 {
diff --git a/firmware/libopencm3 b/firmware/libopencm3
index 7d095fe5..87690732 160000
--- a/firmware/libopencm3
+++ b/firmware/libopencm3
@@ -1 +1 @@
-Subproject commit 7d095fe5f48b12b781a2d2d3849a18d95b8e2b24
+Subproject commit 87690732661dd049657967d3951cb8f4674ede00
diff --git a/firmware/startup/startup.c b/firmware/startup/startup.c
index b805d1f2..71a62010 100644
--- a/firmware/startup/startup.c
+++ b/firmware/startup/startup.c
@@ -27,7 +27,7 @@
 
 int main(void)
 {
-	u32 i;
+	uint32_t i;
 
 	pin_setup();
 
diff --git a/firmware/startup_systick/startup_systick.c b/firmware/startup_systick/startup_systick.c
index 98b4d5b3..e650ac81 100644
--- a/firmware/startup_systick/startup_systick.c
+++ b/firmware/startup_systick/startup_systick.c
@@ -29,12 +29,12 @@
 #include "hackrf_core.h"
 
 /* Global counter incremented by SysTick Interrupt each millisecond */
-volatile u32 g_ulSysTickCount;
-u32 g_NbCyclePerSecond;
+volatile uint32_t g_ulSysTickCount;
+uint32_t g_NbCyclePerSecond;
 
 void systick_setup(void)
 {
-	u32 systick_reload_val;
+	uint32_t systick_reload_val;
 	g_ulSysTickCount = 0;
 
 	/* Disable IRQ globally */
@@ -73,15 +73,15 @@ void scs_dwt_cycle_counter_enabled(void)
 	SCS_DWT_CTRL  |= SCS_DWT_CTRL_CYCCNTENA;
 }
 
-u32 sys_tick_get_time_ms(void)
+uint32_t sys_tick_get_time_ms(void)
 {
     return g_ulSysTickCount;
 }
 
-u32 sys_tick_delta_time_ms(u32 start, u32 end)
+uint32_t sys_tick_delta_time_ms(uint32_t start, uint32_t end)
 {
 	#define MAX_T_U32 ((2^32)-1)
-    u32 diff;
+    uint32_t diff;
 
     if(end > start)
     {
@@ -94,10 +94,10 @@ u32 sys_tick_delta_time_ms(u32 start, u32 end)
     return diff;
 }
 
-void sys_tick_wait_time_ms(u32 wait_ms)
+void sys_tick_wait_time_ms(uint32_t wait_ms)
 {
-    u32 start, end;
-    u32 tickms;
+    uint32_t start, end;
+    uint32_t tickms;
 
     start = sys_tick_get_time_ms();
 
diff --git a/firmware/startup_systick_perfo/perf_mips.c b/firmware/startup_systick_perfo/perf_mips.c
index ef3d1f52..b5cc8345 100644
--- a/firmware/startup_systick_perfo/perf_mips.c
+++ b/firmware/startup_systick_perfo/perf_mips.c
@@ -29,17 +29,17 @@
 #include "hackrf_core.h"
 
 /* Global counter incremented by SysTick Interrupt each millisecond */
-extern volatile u32 g_ulSysTickCount;
-extern u32 g_NbCyclePerSecond;
+extern volatile uint32_t g_ulSysTickCount;
+extern uint32_t g_NbCyclePerSecond;
 
-extern u32 sys_tick_get_time_ms(void);
-extern u32 sys_tick_delta_time_ms(u32 start, u32 end);
-extern void sys_tick_wait_time_ms(u32 wait_ms);
+extern uint32_t sys_tick_get_time_ms(void);
+extern uint32_t sys_tick_delta_time_ms(uint32_t start, uint32_t end);
+extern void sys_tick_wait_time_ms(uint32_t wait_ms);
 
 
-u32 test_nb_instruction_per_sec_100_nop_asm(void)
+uint32_t test_nb_instruction_per_sec_100_nop_asm(void)
 {
-	register u32 val __asm__("r0");
+	register uint32_t val __asm__("r0");
 
 	__asm__(" ldr	r1, =g_ulSysTickCount");
 	__asm__(" ldr	r2, [r1]"); /* g_ulSysTickCount */
@@ -165,9 +165,9 @@ u32 test_nb_instruction_per_sec_100_nop_asm(void)
 	return val;
 };
 
-u32 test_nb_instruction_per_sec_105_nop_asm(void)
+uint32_t test_nb_instruction_per_sec_105_nop_asm(void)
 {
-	register u32 val __asm__("r0");
+	register uint32_t val __asm__("r0");
 
 	__asm__(" ldr	r1, =g_ulSysTickCount");
 	__asm__(" ldr	r2, [r1]"); /* g_ulSysTickCount */
@@ -302,9 +302,9 @@ u32 test_nb_instruction_per_sec_105_nop_asm(void)
 	return val;
 };
 
-u32 test_nb_instruction_per_sec_110_nop_asm(void)
+uint32_t test_nb_instruction_per_sec_110_nop_asm(void)
 {
-	register u32 val __asm__("r0");
+	register uint32_t val __asm__("r0");
 
 	__asm__(" ldr	r1, =g_ulSysTickCount");
 	__asm__(" ldr	r2, [r1]"); /* g_ulSysTickCount */
@@ -444,9 +444,9 @@ u32 test_nb_instruction_per_sec_110_nop_asm(void)
 	return val;
 };
 
-u32 test_nb_instruction_per_sec_115_nop_asm(void)
+uint32_t test_nb_instruction_per_sec_115_nop_asm(void)
 {
-	register u32 val __asm__("r0");
+	register uint32_t val __asm__("r0");
 
 	__asm__(" ldr	r1, =g_ulSysTickCount");
 	__asm__(" ldr	r2, [r1]"); /* g_ulSysTickCount */
@@ -592,9 +592,9 @@ u32 test_nb_instruction_per_sec_115_nop_asm(void)
 	return val;
 };
 
-u32 test_nb_instruction_per_sec_120_nop_asm(void)
+uint32_t test_nb_instruction_per_sec_120_nop_asm(void)
 {
-	register u32 val __asm__("r0");
+	register uint32_t val __asm__("r0");
 
 	__asm__(" ldr	r1, =g_ulSysTickCount");
 	__asm__(" ldr	r2, [r1]"); /* g_ulSysTickCount */
@@ -745,9 +745,9 @@ u32 test_nb_instruction_per_sec_120_nop_asm(void)
 	return val;
 };
 
-u32 test_nb_instruction_per_sec_150_nop_asm(void)
+uint32_t test_nb_instruction_per_sec_150_nop_asm(void)
 {
-	register u32 val __asm__("r0");
+	register uint32_t val __asm__("r0");
 
 	__asm__(" ldr	r1, =g_ulSysTickCount");
 	__asm__(" ldr	r2, [r1]"); /* g_ulSysTickCount */
@@ -931,9 +931,9 @@ u32 test_nb_instruction_per_sec_150_nop_asm(void)
 	return val;
 };
 
-u32 test_nb_instruction_per_sec_200_nop_asm(void)
+uint32_t test_nb_instruction_per_sec_200_nop_asm(void)
 {
-	register u32 val __asm__("r0");
+	register uint32_t val __asm__("r0");
 
 	__asm__(" ldr	r1, =g_ulSysTickCount");
 	__asm__(" ldr	r2, [r1]"); /* g_ulSysTickCount */
@@ -1163,9 +1163,9 @@ u32 test_nb_instruction_per_sec_200_nop_asm(void)
 	return val;
 };
 
-u32 test_nb_instruction_per_sec_1000_nop_asm(void)
+uint32_t test_nb_instruction_per_sec_1000_nop_asm(void)
 {
-	register u32 val __asm__("r0");
+	register uint32_t val __asm__("r0");
 
 	__asm__(" ldr	r1, =g_ulSysTickCount");
 	__asm__(" ldr	r2, [r1]"); /* g_ulSysTickCount */
diff --git a/firmware/startup_systick_perfo/startup_systick.c b/firmware/startup_systick_perfo/startup_systick.c
index a5bae126..28c45199 100644
--- a/firmware/startup_systick_perfo/startup_systick.c
+++ b/firmware/startup_systick_perfo/startup_systick.c
@@ -29,12 +29,12 @@
 #include "hackrf_core.h"
 
 /* Global counter incremented by SysTick Interrupt each millisecond */
-volatile u32 g_ulSysTickCount;
-u32 g_NbCyclePerSecond;
+volatile uint32_t g_ulSysTickCount;
+uint32_t g_NbCyclePerSecond;
 
 void systick_setup(void)
 {
-	u32 systick_reload_val;
+	uint32_t systick_reload_val;
 	g_ulSysTickCount = 0;
 
 	/* Disable IRQ globally */
@@ -73,15 +73,15 @@ void scs_dwt_cycle_counter_enabled(void)
 	SCS_DWT_CTRL  |= SCS_DWT_CTRL_CYCCNTENA;
 }
 
-u32 sys_tick_get_time_ms(void)
+uint32_t sys_tick_get_time_ms(void)
 {
     return g_ulSysTickCount;
 }
 
-u32 sys_tick_delta_time_ms(u32 start, u32 end)
+uint32_t sys_tick_delta_time_ms(uint32_t start, uint32_t end)
 {
 	#define MAX_T_U32 ((2^32)-1)
-    u32 diff;
+    uint32_t diff;
 
     if(end > start)
     {
@@ -94,10 +94,10 @@ u32 sys_tick_delta_time_ms(u32 start, u32 end)
     return diff;
 }
 
-void sys_tick_wait_time_ms(u32 wait_ms)
+void sys_tick_wait_time_ms(uint32_t wait_ms)
 {
-    u32 start, end;
-    u32 tickms;
+    uint32_t start, end;
+    uint32_t tickms;
 
     start = sys_tick_get_time_ms();
 
@@ -127,16 +127,16 @@ void sys_tick_handler(void)
 	g_ulSysTickCount++;
 }
 
-u32 nb_inst_per_sec[16];
+uint32_t nb_inst_per_sec[16];
 
-extern u32 test_nb_instruction_per_sec_100_nop_asm();
-extern u32 test_nb_instruction_per_sec_105_nop_asm();
-extern u32 test_nb_instruction_per_sec_110_nop_asm();
-extern u32 test_nb_instruction_per_sec_115_nop_asm();
-extern u32 test_nb_instruction_per_sec_120_nop_asm();
-extern u32 test_nb_instruction_per_sec_150_nop_asm();
-extern u32 test_nb_instruction_per_sec_200_nop_asm();
-extern u32 test_nb_instruction_per_sec_1000_nop_asm();
+extern uint32_t test_nb_instruction_per_sec_100_nop_asm();
+extern uint32_t test_nb_instruction_per_sec_105_nop_asm();
+extern uint32_t test_nb_instruction_per_sec_110_nop_asm();
+extern uint32_t test_nb_instruction_per_sec_115_nop_asm();
+extern uint32_t test_nb_instruction_per_sec_120_nop_asm();
+extern uint32_t test_nb_instruction_per_sec_150_nop_asm();
+extern uint32_t test_nb_instruction_per_sec_200_nop_asm();
+extern uint32_t test_nb_instruction_per_sec_1000_nop_asm();
 
 #define LED1_TOGGLE()	(gpio_toggle(PORT_LED1_3, (PIN_LED1)))