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

diff --git a/plat/amlogic/common/include/aml_private.h b/plat/amlogic/common/include/aml_private.h
index d6629fc3a4a8a197a66b34e30ef0f1af9460173d..4923745687ea35fed4168cd4e982aaeef72ce115 100644 (file)
--- 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 1af101ef2773bdcb9962bdcb9c5bef4d0157da0a..6f49ed2b0b6dde684fcc4ba2105cebe243f047b7 100644 (file)
--- 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 80b0d6463eb64c0aa39f70cf1b7ac0cf99e7a600..ec64d68534fbdfba041cc223b43e2a697ed4e46d 100644 (file)
--- 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)