Fix uloader build

CL 38411ed01df0f591e7e7d1e50294396683b79042 unintentionally declares
the variable recovery_mode inside a #ifdef CONFIG_SPI section. Move
the declaration outside of the section, also fix a compiler warning
about the declaration of is_recovery_mode().

Change-Id: Ib11a8dc3656afc5d41d345e21a944627b5fded7e
diff --git a/arch/arm/boards/optimus/optimus.c b/arch/arm/boards/optimus/optimus.c
index 43554e1..d452cfa 100644
--- a/arch/arm/boards/optimus/optimus.c
+++ b/arch/arm/boards/optimus/optimus.c
@@ -61,11 +61,11 @@
 
 #define SPACECAST_TPM_I2C_ADDR		0x20
 
+static bool recovery_mode = false;
+
 #ifdef CONFIG_SPI
 //Legacy spi
 
-static bool recovery_mode = false;
-
 static int c2k_spi_cs[4] = {0};
 
 static struct c2k_spi_master c2k_spi_1_data = {
@@ -334,7 +334,7 @@
 	return 1;
 }
 
-int is_recovery_mode() {
+int is_recovery_mode(void) {
 	return recovery_mode;
 }