diff --git a/boards/adafruit-feather-rp2040/src/lib.rs b/boards/adafruit-feather-rp2040/src/lib.rs
index a8f1229..99fb640 100644
--- a/boards/adafruit-feather-rp2040/src/lib.rs
+++ b/boards/adafruit-feather-rp2040/src/lib.rs
@@ -5,7 +5,7 @@ pub extern crate rp2040_hal as hal;
 #[cfg(feature = "rt")]
 extern crate cortex_m_rt;
 #[cfg(feature = "rt")]
-pub use cortex_m_rt::entry;
+pub use hal::entry;
 
 /// The linker will place this boot block at the start of our program image. We
 /// need this to help the ROM bootloader get our code up and running.
diff --git a/boards/adafruit-itsy-bitsy-rp2040/src/lib.rs b/boards/adafruit-itsy-bitsy-rp2040/src/lib.rs
index 1a3394f..f58e2f2 100644
--- a/boards/adafruit-itsy-bitsy-rp2040/src/lib.rs
+++ b/boards/adafruit-itsy-bitsy-rp2040/src/lib.rs
@@ -5,7 +5,7 @@ pub extern crate rp2040_hal as hal;
 #[cfg(feature = "rt")]
 extern crate cortex_m_rt;
 #[cfg(feature = "rt")]
-pub use cortex_m_rt::entry;
+pub use hal::entry;
 
 /// The linker will place this boot block at the start of our program image. We
 /// need this to help the ROM bootloader get our code up and running.
diff --git a/boards/adafruit-kb2040/src/lib.rs b/boards/adafruit-kb2040/src/lib.rs
index 54cda6d..d7c286f 100644
--- a/boards/adafruit-kb2040/src/lib.rs
+++ b/boards/adafruit-kb2040/src/lib.rs
@@ -4,7 +4,7 @@ pub use rp2040_hal as hal;
 #[cfg(feature = "rt")]
 extern crate cortex_m_rt;
 #[cfg(feature = "rt")]
-pub use cortex_m_rt::entry;
+pub use hal::entry;
 
 /// The linker will place this boot block at the start of our program image. We
 /// need this to help the ROM bootloader get our code up and running.
diff --git a/boards/adafruit-macropad/src/lib.rs b/boards/adafruit-macropad/src/lib.rs
index d197432..ab02435 100644
--- a/boards/adafruit-macropad/src/lib.rs
+++ b/boards/adafruit-macropad/src/lib.rs
@@ -5,7 +5,7 @@ pub use rp2040_hal as hal;
 #[cfg(feature = "rt")]
 extern crate cortex_m_rt;
 #[cfg(feature = "rt")]
-pub use cortex_m_rt::entry;
+pub use hal::entry;
 
 // Adafruit macropad uses W25Q64JVxQ flash chip. Should work with BOOT_LOADER_W25Q080 (untested)
 
diff --git a/boards/adafruit-qt-py-rp2040/src/lib.rs b/boards/adafruit-qt-py-rp2040/src/lib.rs
index d576614..d663cb7 100644
--- a/boards/adafruit-qt-py-rp2040/src/lib.rs
+++ b/boards/adafruit-qt-py-rp2040/src/lib.rs
@@ -5,7 +5,7 @@ pub extern crate rp2040_hal as hal;
 #[cfg(feature = "rt")]
 extern crate cortex_m_rt;
 #[cfg(feature = "rt")]
-pub use cortex_m_rt::entry;
+pub use hal::entry;
 
 /// The linker will place this boot block at the start of our program image. We
 /// need this to help the ROM bootloader get our code up and running.
diff --git a/boards/adafruit-trinkey-qt2040/src/lib.rs b/boards/adafruit-trinkey-qt2040/src/lib.rs
index e28fe6d..f9f2c8a 100644
--- a/boards/adafruit-trinkey-qt2040/src/lib.rs
+++ b/boards/adafruit-trinkey-qt2040/src/lib.rs
@@ -5,7 +5,7 @@ pub extern crate rp2040_hal as hal;
 #[cfg(feature = "rt")]
 extern crate cortex_m_rt;
 #[cfg(feature = "rt")]
-pub use cortex_m_rt::entry;
+pub use hal::entry;
 
 /// The linker will place this boot block at the start of our program image. We
 /// need this to help the ROM bootloader get our code up and running.
diff --git a/boards/pimoroni-pico-explorer/src/lib.rs b/boards/pimoroni-pico-explorer/src/lib.rs
index f9ab626..cad63d2 100644
--- a/boards/pimoroni-pico-explorer/src/lib.rs
+++ b/boards/pimoroni-pico-explorer/src/lib.rs
@@ -6,7 +6,7 @@ pub extern crate rp2040_hal as hal;
 extern crate cortex_m_rt;
 
 #[cfg(feature = "rt")]
-pub use cortex_m_rt::entry;
+pub use hal::entry;
 
 /// The linker will place this boot block at the start of our program image. We
 /// need this to help the ROM bootloader get our code up and running.
diff --git a/boards/pimoroni-pico-lipo-16mb/src/lib.rs b/boards/pimoroni-pico-lipo-16mb/src/lib.rs
index 54b6d73..74525da 100644
--- a/boards/pimoroni-pico-lipo-16mb/src/lib.rs
+++ b/boards/pimoroni-pico-lipo-16mb/src/lib.rs
@@ -5,7 +5,7 @@ pub use rp2040_hal as hal;
 #[cfg(feature = "rt")]
 extern crate cortex_m_rt;
 #[cfg(feature = "rt")]
-pub use cortex_m_rt::entry;
+pub use hal::entry;
 
 /// The linker will place this boot block at the start of our program image. We
 /// need this to help the ROM bootloader get our code up and running.
diff --git a/boards/pimoroni-tiny2040/src/lib.rs b/boards/pimoroni-tiny2040/src/lib.rs
index 3341e9c..12f3746 100644
--- a/boards/pimoroni-tiny2040/src/lib.rs
+++ b/boards/pimoroni-tiny2040/src/lib.rs
@@ -5,7 +5,7 @@ pub extern crate rp2040_hal as hal;
 #[cfg(feature = "rt")]
 extern crate cortex_m_rt;
 #[cfg(feature = "rt")]
-pub use cortex_m_rt::entry;
+pub use hal::entry;
 
 /// The linker will place this boot block at the start of our program image. We
 /// need this to help the ROM bootloader get our code up and running.
diff --git a/boards/rp-pico/src/lib.rs b/boards/rp-pico/src/lib.rs
index 59532d3..06f2a36 100644
--- a/boards/rp-pico/src/lib.rs
+++ b/boards/rp-pico/src/lib.rs
@@ -5,7 +5,7 @@ pub extern crate rp2040_hal as hal;
 #[cfg(feature = "rt")]
 extern crate cortex_m_rt;
 #[cfg(feature = "rt")]
-pub use cortex_m_rt::entry;
+pub use hal::entry;
 
 /// The linker will place this boot block at the start of our program image. We
 /// need this to help the ROM bootloader get our code up and running.
diff --git a/boards/solderparty-rp2040-stamp/src/lib.rs b/boards/solderparty-rp2040-stamp/src/lib.rs
index c5afea5..e98e2c7 100644
--- a/boards/solderparty-rp2040-stamp/src/lib.rs
+++ b/boards/solderparty-rp2040-stamp/src/lib.rs
@@ -5,7 +5,7 @@ pub use rp2040_hal as hal;
 #[cfg(feature = "rt")]
 extern crate cortex_m_rt;
 #[cfg(feature = "rt")]
-pub use cortex_m_rt::entry;
+pub use hal::entry;
 
 /// The linker will place this boot block at the start of our program image. We
 /// need this to help the ROM bootloader get our code up and running.
diff --git a/boards/sparkfun-pro-micro-rp2040/src/lib.rs b/boards/sparkfun-pro-micro-rp2040/src/lib.rs
index e4039b0..cc9e6f1 100644
--- a/boards/sparkfun-pro-micro-rp2040/src/lib.rs
+++ b/boards/sparkfun-pro-micro-rp2040/src/lib.rs
@@ -4,7 +4,7 @@ pub use rp2040_hal as hal;
 #[cfg(feature = "rt")]
 extern crate cortex_m_rt;
 #[cfg(feature = "rt")]
-pub use cortex_m_rt::entry;
+pub use hal::entry;
 
 /// The linker will place this boot block at the start of our program image. We
 /// need this to help the ROM bootloader get our code up and running.