From d498d2497096807f6fed026dda206fe2c5ae11b1 Mon Sep 17 00:00:00 2001
From: Carlo Caione <ccaione@baylibre.com>
Date: Sat, 24 Aug 2019 17:43:33 +0100
Subject: [PATCH] amlogic: Move efuse code to common directory
The efuse code is the same between GXL and GXBB. Move the code to common
directory.
Signed-off-by: Carlo Caione <ccaione@baylibre.com>
Change-Id: Ie37f21d1907a36292724f1fb645a78041fe4a6b3
---
.../{gxbb/gxbb_efuse.c => common/aml_efuse.c} | 0
plat/amlogic/gxbb/platform.mk | 2 +-
plat/amlogic/gxl/gxl_efuse.c | 25 -------------------
plat/amlogic/gxl/platform.mk | 2 +-
4 files changed, 2 insertions(+), 27 deletions(-)
rename plat/amlogic/{gxbb/gxbb_efuse.c => common/aml_efuse.c} (100%)
delete mode 100644 plat/amlogic/gxl/gxl_efuse.c
diff --git a/plat/amlogic/gxbb/gxbb_efuse.c b/plat/amlogic/common/aml_efuse.c
similarity index 100%
rename from plat/amlogic/gxbb/gxbb_efuse.c
rename to plat/amlogic/common/aml_efuse.c
diff --git a/plat/amlogic/gxbb/platform.mk b/plat/amlogic/gxbb/platform.mk
index 2430f2340..d2d337caf 100644
--- a/plat/amlogic/gxbb/platform.mk
+++ b/plat/amlogic/gxbb/platform.mk
@@ -28,7 +28,7 @@ BL31_SOURCES += lib/cpus/aarch64/cortex_a53.S \
plat/common/plat_psci_common.c \
${AML_PLAT_COMMON}/aarch64/aml_helpers.S \
${AML_PLAT_SOC}/gxbb_bl31_setup.c \
- ${AML_PLAT_SOC}/gxbb_efuse.c \
+ ${AML_PLAT_COMMON}/aml_efuse.c \
${AML_PLAT_SOC}/gxbb_mhu.c \
${AML_PLAT_SOC}/gxbb_pm.c \
${AML_PLAT_COMMON}/aml_scpi.c \
diff --git a/plat/amlogic/gxl/gxl_efuse.c b/plat/amlogic/gxl/gxl_efuse.c
deleted file mode 100644
index 412480213..000000000
--- a/plat/amlogic/gxl/gxl_efuse.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
- *
- * SPDX-License-Identifier: BSD-3-Clause
- */
-
-#include <stdint.h>
-
-#include "aml_private.h"
-
-#define EFUSE_BASE 0x140
-#define EFUSE_SIZE 0xC0
-
-uint64_t gxbb_efuse_read(void *dst, uint32_t offset, uint32_t size)
-{
- if ((uint64_t)(offset + size) > (uint64_t)EFUSE_SIZE)
- return 0;
-
- return scpi_efuse_read(dst, offset + EFUSE_BASE, size);
-}
-
-uint64_t gxbb_efuse_user_max(void)
-{
- return EFUSE_SIZE;
-}
diff --git a/plat/amlogic/gxl/platform.mk b/plat/amlogic/gxl/platform.mk
index f2394829a..5c8206cf1 100644
--- a/plat/amlogic/gxl/platform.mk
+++ b/plat/amlogic/gxl/platform.mk
@@ -31,7 +31,7 @@ BL31_SOURCES += lib/cpus/aarch64/cortex_a53.S \
plat/common/plat_psci_common.c \
${AML_PLAT_COMMON}/aarch64/aml_helpers.S \
${AML_PLAT_SOC}/gxl_bl31_setup.c \
- ${AML_PLAT_SOC}/gxl_efuse.c \
+ ${AML_PLAT_COMMON}/aml_efuse.c \
${AML_PLAT_SOC}/gxl_mhu.c \
${AML_PLAT_SOC}/gxl_pm.c \
${AML_PLAT_COMMON}/aml_scpi.c \
--
GitLab