diff --git a/bootloaders/riotboot/Makefile b/bootloaders/riotboot/Makefile
index 4800be4f9e..bd478e0a24 100644
--- a/bootloaders/riotboot/Makefile
+++ b/bootloaders/riotboot/Makefile
@@ -4,4 +4,8 @@ APPLICATION = riotboot
 # Include riotboot flash partition functionality
 USEMODULE += riotboot_slot
 
+# We don't want to re-configure any hardware
+CFLAGS += -DDISABLE_BOARD_INIT=1
+CFLAGS += -DDISABLE_CPU_INIT=1
+
 include ../riotboot_common.mk