From 9dd72ddbfd0bcaa9afb7906af7cd8e31f293465c Mon Sep 17 00:00:00 2001
From: Ben Levinsky <ben.levinsky@amd.com>
Date: Mon, 11 Sep 2023 14:15:27 -0700
Subject: [PATCH] lib: a53: remove redundant MB and GB macros

lib/utilities.h provided MB and GB macros so include from there
instead of providing the definition again for a53 platforms.

Signed-off-by: Ben Levinsky <ben.levinsky@amd.com>
---
 lib/system/freertos/zynqmp_a53/sys.c | 4 +---
 lib/system/generic/zynqmp_a53/sys.c  | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/system/freertos/zynqmp_a53/sys.c b/lib/system/freertos/zynqmp_a53/sys.c
index a09f922..411776e 100644
--- a/lib/system/freertos/zynqmp_a53/sys.c
+++ b/lib/system/freertos/zynqmp_a53/sys.c
@@ -12,6 +12,7 @@
 #include <metal/compiler.h>
 #include <metal/io.h>
 #include <metal/sys.h>
+#include <metal/utilities.h>
 #include <stdint.h>
 #include "xil_cache.h"
 #include "xil_exception.h"
@@ -19,9 +20,6 @@
 #include "xreg_cortexa53.h"
 #include "xscugic.h"
 
-#define MB (1024 * 1024UL)
-#define GB (1024 * 1024 * 1024UL)
-
 void sys_irq_restore_enable(unsigned int flags)
 {
 	Xil_ExceptionEnableMask(~flags);
diff --git a/lib/system/generic/zynqmp_a53/sys.c b/lib/system/generic/zynqmp_a53/sys.c
index 1a244ed..bbb07c6 100644
--- a/lib/system/generic/zynqmp_a53/sys.c
+++ b/lib/system/generic/zynqmp_a53/sys.c
@@ -12,6 +12,7 @@
 #include <metal/compiler.h>
 #include <metal/io.h>
 #include <metal/sys.h>
+#include <metal/utilities.h>
 #include <stdint.h>
 #include "xil_cache.h"
 #include "xil_exception.h"
@@ -19,9 +20,6 @@
 #include "xreg_cortexa53.h"
 #include "xscugic.h"
 
-#define MB (1024 * 1024UL)
-#define GB (1024 * 1024 * 1024UL)
-
 void sys_irq_restore_enable(unsigned int flags)
 {
 	Xil_ExceptionEnableMask(~flags);