diff --git a/plat/rpi/common/rpi3_common.c b/plat/rpi/common/rpi3_common.c
index 8fc357a..ef88bf1 100644
--- a/plat/rpi/common/rpi3_common.c
+++ b/plat/rpi/common/rpi3_common.c
@@ -13,6 +13,7 @@
 #include <common/debug.h>
 #include <bl31/interrupt_mgmt.h>
 #include <drivers/console.h>
+#include <drivers/rpi3/gpio/rpi3_gpio.h>
 #include <drivers/ti/uart/uart_16550.h>
 #include <drivers/arm/pl011.h>
 #include <lib/xlat_tables/xlat_tables_v2.h>
@@ -105,9 +106,10 @@
  ******************************************************************************/
 static console_t rpi3_console;
 
+
 static bool rpi3_use_mini_uart(void)
 {
-	return true;
+	return rpi3_gpio_get_select(14) == RPI3_GPIO_FUNC_ALT5;
 }
 
 void rpi3_console_init(void)
@@ -118,6 +120,8 @@
 	if (RPI3_RUNTIME_UART != -1)
 		console_scope |= CONSOLE_FLAG_RUNTIME;
 
+	rpi3_gpio_init();
+
 	if (rpi3_use_mini_uart())
 		rc = console_16550_register(PLAT_RPI_MINI_UART_BASE,
 					    0,
diff --git a/plat/rpi/rpi4/platform.mk b/plat/rpi/rpi4/platform.mk
index 28fcda8..49e78df 100644
--- a/plat/rpi/rpi4/platform.mk
+++ b/plat/rpi/rpi4/platform.mk
@@ -21,6 +21,9 @@
 				drivers/arm/gic/common/gic_common.c     \
 				drivers/arm/gic/v2/gicv2_helpers.c      \
 				drivers/arm/gic/v2/gicv2_main.c         \
+				drivers/delay_timer/delay_timer.c	\
+				drivers/gpio/gpio.c			\
+				drivers/rpi3/gpio/rpi3_gpio.c		\
 				plat/common/plat_gicv2.c                \
 				plat/rpi/rpi4/rpi4_bl31_setup.c		\
 				plat/rpi/common/rpi3_pm.c		\