From 421b67b66697374f504ec2eb3d9f954437e02f2e Mon Sep 17 00:00:00 2001
From: Carlo Caione <ccaione@baylibre.com>
Date: Wed, 28 Aug 2019 10:14:46 +0100
Subject: [PATCH] amlogic: Fix header guards

Make the header guards more generic and contextually remove the
GXBB_BL31_PLAT_PARAM_VAL value that is unused on the GXL platform.

Signed-off-by: Carlo Caione <ccaione@baylibre.com>
Change-Id: I842fa2e084e71280ae17b39c67877e844821a171
---
 plat/amlogic/common/include/aml_private.h | 6 +++---
 plat/amlogic/gxl/gxl_def.h                | 6 +++---
 plat/amlogic/gxl/include/platform_def.h   | 3 ---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/plat/amlogic/common/include/aml_private.h b/plat/amlogic/common/include/aml_private.h
index d6629fc3a..492374568 100644
--- a/plat/amlogic/common/include/aml_private.h
+++ b/plat/amlogic/common/include/aml_private.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef GXBB_PRIVATE_H
-#define GXBB_PRIVATE_H
+#ifndef AML_PRIVATE_H
+#define AML_PRIVATE_H
 
 #include <stddef.h>
 #include <stdint.h>
@@ -37,4 +37,4 @@ void aml_thermal_unknown(void);
 uint64_t aml_efuse_read(void *dst, uint32_t offset, uint32_t size);
 uint64_t aml_efuse_user_max(void);
 
-#endif /* GXBB_PRIVATE_H */
+#endif /* AML_PRIVATE_H */
diff --git a/plat/amlogic/gxl/gxl_def.h b/plat/amlogic/gxl/gxl_def.h
index 1af101ef2..6f49ed2b0 100644
--- a/plat/amlogic/gxl/gxl_def.h
+++ b/plat/amlogic/gxl/gxl_def.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: BSD-3-Clause
  */
 
-#ifndef GXBB_DEF_H
-#define GXBB_DEF_H
+#ifndef GXL_DEF_H
+#define GXL_DEF_H
 
 #include <lib/utils_def.h>
 
@@ -125,4 +125,4 @@
 #define AML_JTAG_A53_AO				U(2)
 #define AML_JTAG_A53_EE				U(3)
 
-#endif /* GXBB_DEF_H */
+#endif /* GXL_DEF_H */
diff --git a/plat/amlogic/gxl/include/platform_def.h b/plat/amlogic/gxl/include/platform_def.h
index 80b0d6463..ec64d6853 100644
--- a/plat/amlogic/gxl/include/platform_def.h
+++ b/plat/amlogic/gxl/include/platform_def.h
@@ -15,9 +15,6 @@
 #define PLATFORM_LINKER_FORMAT		"elf64-littleaarch64"
 #define PLATFORM_LINKER_ARCH		aarch64
 
-/* Special value used to verify platform parameters from BL2 to BL31 */
-#define GXBB_BL31_PLAT_PARAM_VAL	ULL(0x0F1E2D3C4B5A6978)
-
 #define PLATFORM_STACK_SIZE		UL(0x1000)
 
 #define PLATFORM_MAX_CPUS_PER_CLUSTER	U(4)
-- 
GitLab