Merge pull request #1920 from ambroise-arm/av/deprecated

Remove deprecated interfaces

plat/common/aarch32/platform_helpers.S

 /*
- * Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2016-2019, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -8,11 +8,6 @@
 #include <asm_macros.S>
 
 	.weak	plat_report_exception
-#if !ERROR_DEPRECATED
-	.weak	plat_crash_console_init
-	.weak	plat_crash_console_putc
-	.weak	plat_crash_console_flush
-#endif
 	.weak	plat_reset_handler
 	.weak	plat_disable_acp
 	.weak	bl1_plat_prepare_exit
@@ -28,37 +23,6 @@ func plat_report_exception
 	bx	lr
 endfunc plat_report_exception
 
-#if !ERROR_DEPRECATED
-	/* -----------------------------------------------------
-	 * Placeholder function which should be redefined by
-	 * each platform.
-	 * -----------------------------------------------------
-	 */
-func plat_crash_console_init
-	mov	r0, #0
-	bx	lr
-endfunc plat_crash_console_init
-
-	/* -----------------------------------------------------
-	 * Placeholder function which should be redefined by
-	 * each platform.
-	 * -----------------------------------------------------
-	 */
-func plat_crash_console_putc
-	bx	lr
-endfunc plat_crash_console_putc
-
-	/* -----------------------------------------------------
-	 * Placeholder function which should be redefined by
-	 * each platform.
-	 * -----------------------------------------------------
-	 */
-func plat_crash_console_flush
-	mov	r0, #0
-	bx	lr
-endfunc plat_crash_console_flush
-#endif
-
 	/* -----------------------------------------------------
 	 * Placeholder function which should be redefined by
 	 * each platform.

plat/common/aarch64/platform_helpers.S

@@ -10,11 +10,6 @@
 #include <platform_def.h>
 
 	.weak	plat_report_exception
-#if !ERROR_DEPRECATED
-	.weak	plat_crash_console_init
-	.weak	plat_crash_console_putc
-	.weak	plat_crash_console_flush
-#endif
 	.weak	plat_reset_handler
 	.weak	plat_disable_acp
 	.weak	bl1_plat_prepare_exit
@@ -37,21 +32,6 @@ func plat_report_exception
 	ret
 endfunc plat_report_exception
 
-#if !ERROR_DEPRECATED
-func plat_crash_console_init
-	mov	x0, #0
-	ret
-endfunc plat_crash_console_init
-
-func plat_crash_console_putc
-	ret
-endfunc plat_crash_console_putc
-
-func plat_crash_console_flush
-	ret
-endfunc plat_crash_console_flush
-#endif /* ERROR_DEPRECATED */
-
 	/* -----------------------------------------------------
 	 * Placeholder function which should be redefined by
 	 * each platform. This function should preserve x19 - x29.

plat/imx/common/aarch32/imx_uart_console.S

@@ -6,7 +6,6 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#define USE_FINISH_CONSOLE_REG_2
 #include <console_macros.S>
 #include <assert_macros.S>
 #include "imx_uart.h"

plat/imx/common/imx_sip_handler.c

@@ -6,7 +6,7 @@
 
 #include <stdlib.h>
 #include <stdint.h>
-#include <std_svc.h>
+#include <services/std_svc.h>
 #include <string.h>
 #include <platform_def.h>
 #include <common/debug.h>

plat/imx/common/imx_uart_console.S

@@ -6,7 +6,6 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#define USE_FINISH_CONSOLE_REG_2
 #include <console_macros.S>
 #include <assert_macros.S>
 #include "imx_uart.h"

plat/imx/common/lpuart_console.S

@@ -6,7 +6,6 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#define USE_FINISH_CONSOLE_REG_2
 #include <console_macros.S>
 #include <assert_macros.S>
 #include "imx8_lpuart.h"

plat/layerscape/common/aarch64/ls_console.S

@@ -6,7 +6,6 @@
 
 #include <arch.h>
 #include <asm_macros.S>
-#define USE_FINISH_CONSOLE_REG_2
 #include <console_macros.S>
 #include <assert_macros.S>
 #include "ls_16550.h"

plat/mediatek/mt6795/aarch64/plat_helpers.S

 /*
- * Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2016-2019, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -12,6 +12,7 @@
 	.globl	platform_is_primary_cpu
 	.globl	plat_crash_console_init
 	.globl	plat_crash_console_putc
+	.globl	plat_crash_console_flush
 	.globl	platform_mem_init
 
 
@@ -121,6 +122,19 @@ func plat_crash_console_putc
 	ret
 endfunc plat_crash_console_putc
 
+	/* ---------------------------------------------
+	 * int plat_crash_console_flush(int c)
+	 * Function to force a write of all buffered
+	 * data that hasn't been output.
+	 * Out : return -1 on error else return 0.
+	 * Clobber list : x0, x1
+	 * ---------------------------------------------
+	 */
+func plat_crash_console_flush
+	mov_imm	x0, UART0_BASE
+	b	console_core_flush
+endfunc plat_crash_console_flush
+
 	/* --------------------------------------------------------
 	 * void platform_mem_init (void);
 	 *

plat/mediatek/mt8173/aarch64/plat_helpers.S

 /*
- * Copyright (c) 2013-2015, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2019, ARM Limited and Contributors. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -13,6 +13,7 @@
 	.globl  plat_my_core_pos
 	.globl	plat_crash_console_init
 	.globl	plat_crash_console_putc
+	.globl	plat_crash_console_flush
 
 	/* -----------------------------------------------------
 	 * void plat_secondary_cold_boot_setup (void);
@@ -75,3 +76,16 @@ func plat_crash_console_putc
 	mov_imm x1, MT8173_UART0_BASE
 	b	console_core_putc
 endfunc plat_crash_console_putc
+
+	/* ---------------------------------------------
+	 * int plat_crash_console_flush(int c)
+	 * Function to force a write of all buffered
+	 * data that hasn't been output.
+	 * Out : return -1 on error else return 0.
+	 * Clobber list : x0, x1
+	 * ---------------------------------------------
+	 */
+func plat_crash_console_flush
+	mov_imm	x0, MT8173_UART0_BASE
+	b	console_core_flush
+endfunc plat_crash_console_flush

plat/nvidia/tegra/common/drivers/bpmp/bpmp.c

@@ -8,10 +8,10 @@
 #include <assert.h>
 #include <bpmp.h>
 #include <common/debug.h>
-#include <delay_timer.h>
+#include <drivers/delay_timer.h>
 #include <errno.h>
-#include <mmio.h>
-#include <platform.h>
+#include <lib/mmio.h>
+#include <plat/common/platform.h>
 #include <stdbool.h>
 #include <string.h>
 #include <tegra_def.h>

plat/nvidia/tegra/common/drivers/bpmp_ipc/intf.c

@@ -7,13 +7,13 @@
 #include <assert.h>
 #include <bpmp_ipc.h>
 #include <debug.h>
-#include <delay_timer.h>
+#include <drivers/delay_timer.h>
 #include <errno.h>
-#include <mmio.h>
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
 #include <stdbool.h>
 #include <string.h>
 #include <tegra_def.h>
-#include <utils_def.h>
 
 #include "intf.h"
 #include "ivc.h"

plat/nvidia/tegra/common/drivers/bpmp_ipc/ivc.h

@@ -7,9 +7,9 @@
 #ifndef IVC_H
 #define IVC_H
 
+#include <lib/utils_def.h>
 #include <stdint.h>
 #include <stddef.h>
-#include <utils_def.h>
 
 #define IVC_ALIGN		U(64)
 #define IVC_CHHDR_TX_FIELDS	U(16)

plat/nvidia/tegra/common/drivers/flowctrl/flowctrl.c

@@ -13,9 +13,9 @@
 #include <lib/mmio.h>
 
 #include <flowctrl.h>
+#include <lib/utils_def.h>
 #include <pmc.h>
 #include <tegra_def.h>
-#include <utils_def.h>
 
 #define CLK_RST_DEV_L_SET		0x300
 #define CLK_RST_DEV_L_CLR		0x304

plat/nvidia/tegra/common/drivers/gpcdma/gpcdma.c

@@ -6,14 +6,14 @@
 
 #include <arch_helpers.h>
 #include <common/debug.h>
-#include <delay_timer.h>
+#include <drivers/delay_timer.h>
 #include <errno.h>
 #include <gpcdma.h>
-#include <mmio.h>
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
 #include <platform_def.h>
 #include <stdbool.h>
 #include <tegra_def.h>
-#include <utils_def.h>
 
 /* DMA channel registers */
 #define DMA_CH_CSR				U(0x0)

plat/nvidia/tegra/common/lib/debug/profiler.c

@@ -23,12 +23,12 @@
 #include <arch.h>
 #include <arch_helpers.h>
 #include <assert.h>
-#include <mmio.h>
+#include <lib/mmio.h>
+#include <lib/utils_def.h>
+#include <lib/xlat_tables/xlat_tables_v2.h>
 #include <profiler.h>
 #include <stdbool.h>
 #include <string.h>
-#include <utils_def.h>
-#include <xlat_tables_v2.h>
 
 static uint64_t shmem_base_addr;
 

plat/nvidia/tegra/common/tegra_topology.c

@@ -7,8 +7,8 @@
 #include <platform_def.h>
 
 #include <arch.h>
-#include <platform.h>
 #include <lib/psci/psci.h>
+#include <plat/common/platform.h>
 
 #pragma weak plat_core_pos_by_mpidr
 

plat/nvidia/tegra/include/drivers/bpmp_ipc.h

@@ -7,9 +7,9 @@
 #ifndef __BPMP_IPC_H__
 #define __BPMP_IPC_H__
 
+#include <lib/utils_def.h>
 #include <stdbool.h>
 #include <stdint.h>
-#include <utils_def.h>
 
 /**
  * Currently supported reset identifiers

plat/nvidia/tegra/include/drivers/memctrl_v2.h

@@ -11,7 +11,7 @@
 
 #ifndef __ASSEMBLY__
 
-#include <mmio.h>
+#include <lib/mmio.h>
 #include <stdint.h>
 
 /*******************************************************************************

plat/nvidia/tegra/include/plat_macros.S

@@ -7,7 +7,7 @@
 #ifndef PLAT_MACROS_S
 #define PLAT_MACROS_S
 
-#include <gicv2.h>
+#include <drivers/arm/gicv2.h>
 #include <tegra_def.h>
 
 .section .rodata.gic_reg_name, "aS"

plat/nvidia/tegra/include/tegra_platform.h

@@ -8,8 +8,8 @@
 #define TEGRA_PLATFORM_H
 
 #include <cdefs.h>
+#include <lib/utils_def.h>
 #include <stdbool.h>
-#include <utils_def.h>
 
 /*******************************************************************************
  * Tegra major, minor version helper macros