marvell: Consolidate console register calls

Now that different UARTs share the same console_t struct, we can
simplify the console selection for the Marvell platforms:
We share the same console_t pointers, just change the name of the
console register functions, depending on the selected platform.

Change-Id: I6fe3e49fd7f208a9b3372c5deef43236a12867bc
Signed-off-by: Andre Przywara <andre.przywara@arm.com>

plat/marvell/common/marvell_console.c

@@ -14,15 +14,14 @@
 
 #ifdef PLAT_a3700
 #include <drivers/marvell/uart/a3700_console.h>
-
-static console_t marvell_boot_console;
-static console_t marvell_runtime_console;
+#define console_marvell_register console_a3700_register
 #else
 #include <drivers/ti/uart/uart_16550.h>
+#define console_marvell_register console_16550_register
+#endif
 
 static console_t marvell_boot_console;
 static console_t marvell_runtime_console;
-#endif
 
 /*******************************************************************************
  * Functions that set up the console
@@ -32,12 +31,7 @@ static console_t marvell_runtime_console;
 void marvell_console_boot_init(void)
 {
 	int rc =
-#ifdef PLAT_a3700
-	console_a3700_register(
-#else
-	console_16550_register(
-#endif
-				PLAT_MARVELL_BOOT_UART_BASE,
+	console_marvell_register(PLAT_MARVELL_BOOT_UART_BASE,
 				 PLAT_MARVELL_BOOT_UART_CLK_IN_HZ,
 				 MARVELL_CONSOLE_BAUDRATE,
 				 &marvell_boot_console);
@@ -64,12 +58,7 @@ void marvell_console_boot_end(void)
 void marvell_console_runtime_init(void)
 {
 	int rc =
-#ifdef PLAT_a3700
-	console_a3700_register(
-#else
-	console_16550_register(
-#endif
-				PLAT_MARVELL_BOOT_UART_BASE,
+	console_marvell_register(PLAT_MARVELL_BOOT_UART_BASE,
 				 PLAT_MARVELL_BOOT_UART_CLK_IN_HZ,
 				 MARVELL_CONSOLE_BAUDRATE,
 				 &marvell_runtime_console);