diff --git a/src/system/boot/platform/raspberrypi_arm/serial.cpp b/src/system/boot/platform/raspberrypi_arm/serial.cpp
index ec6f6c054b..926f0b4092 100644
--- a/src/system/boot/platform/raspberrypi_arm/serial.cpp
+++ b/src/system/boot/platform/raspberrypi_arm/serial.cpp
@@ -67,7 +67,9 @@ serial_enable(void)
 extern "C" void
 serial_cleanup(void)
 {
-#warning IMPLEMENT serial_cleanup
+	// Transmit the last of our fifo
+	gLoaderUART.FlushTx();
+	gLoaderUART.Disable();
 }
 
 
diff --git a/src/system/boot/platform/raspberrypi_arm/start.c b/src/system/boot/platform/raspberrypi_arm/start.c
index bac1ceede7..366bb64354 100644
--- a/src/system/boot/platform/raspberrypi_arm/start.c
+++ b/src/system/boot/platform/raspberrypi_arm/start.c
@@ -92,7 +92,7 @@ platform_start_kernel(void)
 void
 platform_exit(void)
 {
-	#warning IMPLEMENT platform_exit
+	serial_cleanup();
 }