adapt to new opencm3 include structure

buttons.h

@@ -20,7 +20,7 @@
 #ifndef __BUTTONS_H__
 #define __BUTTONS_H__
 
-#include <libopencm3/stm32/f2/gpio.h>
+#include <libopencm3/stm32/gpio.h>
 
 struct buttonState {
 	volatile bool YesUp;

firmware/storage.c

@@ -20,7 +20,7 @@
 #include <string.h>
 #include <stdint.h>
 
-#include <libopencm3/stm32/f2/flash.h>
+#include <libopencm3/stm32/flash.h>
 
 #include "messages.pb.h"
 #include "storage.pb.h"

memory.c

@@ -17,7 +17,7 @@
  * along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/f2/flash.h>
+#include <libopencm3/stm32/flash.h>
 #include <stdint.h>
 #include "memory.h"
 #include "sha2.h"

oled.c

@@ -17,8 +17,8 @@
  * along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/f2/gpio.h>
-#include <libopencm3/stm32/f2/spi.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/spi.h>
 
 #include <string.h>
 

rng.c

@@ -17,6 +17,8 @@
  * along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <libopencm3/cm3/common.h>
+#include <libopencm3/stm32/memorymap.h>
 #include <libopencm3/stm32/f2/rng.h>
 
 #include "rng.h"

setup.c

@@ -17,9 +17,9 @@
  * along with this library.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <libopencm3/stm32/f2/rcc.h>
-#include <libopencm3/stm32/f2/gpio.h>
-#include <libopencm3/stm32/f2/spi.h>
+#include <libopencm3/stm32/rcc.h>
+#include <libopencm3/stm32/gpio.h>
+#include <libopencm3/stm32/spi.h>
 #include <libopencm3/stm32/f2/rng.h>
 
 void setup(void)