Index: boot/arch/sparc32/include/ambapp.h
===================================================================
--- boot/arch/sparc32/include/ambapp.h	(revision f6f22cdb8c1b90a7f75b678cb2f8f6bf158be493)
+++ boot/arch/sparc32/include/ambapp.h	(revision e1cad189212fea8b55f44fba4e1c703494bb05d6)
@@ -150,7 +150,4 @@
 } __attribute__((packed)) mctrl_mcfg2_t;
 
-extern amba_device_t amba_devices[AMBAPP_MAX_DEVICES];
-extern int amba_devices_found;
-extern bool amba_fake;
 extern uintptr_t amba_uart_base;
 
Index: boot/arch/sparc32/src/ambapp.c
===================================================================
--- boot/arch/sparc32/src/ambapp.c	(revision f6f22cdb8c1b90a7f75b678cb2f8f6bf158be493)
+++ boot/arch/sparc32/src/ambapp.c	(revision e1cad189212fea8b55f44fba4e1c703494bb05d6)
@@ -49,4 +49,10 @@
 #include <str.h>
 #include <errno.h>
+
+uintptr_t amba_uart_base;
+
+static amba_device_t amba_devices[AMBAPP_MAX_DEVICES];
+static unsigned int amba_devices_found;
+static bool amba_fake;
 
 static void ambapp_scan_area(uintptr_t, unsigned int);