From 89dd2603b6c8f7652a552aee3c6286169d3d34a6 Mon Sep 17 00:00:00 2001
From: Kent McLeod <Kent.Mcleod@data61.csiro.au>
Date: Wed, 13 Feb 2019 17:19:20 +1100
Subject: [PATCH] arm: Remove empty level2 cache code

---
 include/plat/bcm2837/plat/machine/hardware.h  |  7 ----
 .../hardware.c => arch/arm/machine/l2c_nop.c} |  2 +-
 src/plat/allwinnerA20/machine/hardware.c      |  4 ---
 src/plat/allwinnerA20/machine/l2cache.c       |  5 +++
 src/plat/am335x/machine/hardware.c            |  5 ---
 src/plat/am335x/machine/l2cache.c             |  5 +++
 src/plat/apq8064/config.cmake                 |  3 +-
 src/plat/apq8064/machine/hardware.c           | 25 ---------------
 src/plat/apq8064/machine/l2cache.c            | 14 --------
 src/plat/bcm2837/config.cmake                 |  2 +-
 src/plat/bcm2837/machine/l2cache.c            | 15 ---------
 src/plat/exynos5/config.cmake                 |  2 +-
 src/plat/exynos5/machine/hardware.c           |  4 ---
 src/plat/exynos5/machine/l2cache.c            | 17 ----------
 src/plat/hikey/config.cmake                   |  2 +-
 src/plat/hikey/machine/hardware.c             | 24 --------------
 src/plat/imx7/config.cmake                    |  2 +-
 src/plat/imx7/machine/hardware.c              | 24 --------------
 src/plat/omap3/machine/hardware.c             |  5 ---
 src/plat/omap3/machine/l2cache.c              |  5 +++
 src/plat/tk1/config.cmake                     |  3 +-
 src/plat/tk1/machine/hardware.c               | 19 -----------
 src/plat/tk1/machine/l2cache.c                | 18 -----------
 src/plat/tx1/config.cmake                     |  3 +-
 src/plat/tx1/machine/hardware.c               | 22 -------------
 src/plat/tx1/machine/l2cache.c                | 20 ------------
 src/plat/tx2/config.cmake                     |  3 +-
 src/plat/tx2/machine/l2cache.c                | 20 ------------
 src/plat/zynqmp/config.cmake                  |  1 +
 src/plat/zynqmp/machine/hardware.c            | 32 -------------------
 30 files changed, 25 insertions(+), 288 deletions(-)
 rename src/{plat/tx2/machine/hardware.c => arch/arm/machine/l2c_nop.c} (96%)
 delete mode 100644 src/plat/apq8064/machine/hardware.c
 delete mode 100644 src/plat/apq8064/machine/l2cache.c
 delete mode 100644 src/plat/bcm2837/machine/l2cache.c
 delete mode 100644 src/plat/exynos5/machine/l2cache.c
 delete mode 100644 src/plat/hikey/machine/hardware.c
 delete mode 100644 src/plat/imx7/machine/hardware.c
 delete mode 100644 src/plat/tk1/machine/hardware.c
 delete mode 100644 src/plat/tk1/machine/l2cache.c
 delete mode 100644 src/plat/tx1/machine/hardware.c
 delete mode 100644 src/plat/tx1/machine/l2cache.c
 delete mode 100644 src/plat/tx2/machine/l2cache.c
 delete mode 100644 src/plat/zynqmp/machine/hardware.c

diff --git a/include/plat/bcm2837/plat/machine/hardware.h b/include/plat/bcm2837/plat/machine/hardware.h
index b90a585a0..27452a0d6 100644
--- a/include/plat/bcm2837/plat/machine/hardware.h
+++ b/include/plat/bcm2837/plat/machine/hardware.h
@@ -18,11 +18,4 @@
 #include <linker.h>
 #include <machine/io.h>
 
-void initL2Cache(void);
-
-static inline void plat_cleanL2Range(paddr_t start, paddr_t end) {}
-static inline void plat_invalidateL2Range(paddr_t start, paddr_t end) {}
-static inline void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end) {}
-static inline void plat_cleanInvalidateCache(void) {}
-
 #endif /* !__PLAT_MACHINE_HARDWARE_H */
diff --git a/src/plat/tx2/machine/hardware.c b/src/arch/arm/machine/l2c_nop.c
similarity index 96%
rename from src/plat/tx2/machine/hardware.c
rename to src/arch/arm/machine/l2c_nop.c
index 7deaca03f..1277c927d 100644
--- a/src/plat/tx2/machine/hardware.c
+++ b/src/arch/arm/machine/l2c_nop.c
@@ -15,7 +15,7 @@
 #include <arch/machine.h>
 #include <linker.h>
 
-
+void initL2Cache(void) {}
 void plat_cleanL2Range(paddr_t start, paddr_t end) {}
 void plat_invalidateL2Range(paddr_t start, paddr_t end) {}
 void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end) {}
diff --git a/src/plat/allwinnerA20/machine/hardware.c b/src/plat/allwinnerA20/machine/hardware.c
index d420d6d48..24f614816 100755
--- a/src/plat/allwinnerA20/machine/hardware.c
+++ b/src/plat/allwinnerA20/machine/hardware.c
@@ -40,7 +40,3 @@ initTimer(void)
     timer->tmr0_ctrl_reg = TIMER_CTL_EN_FLAG | TIMER_CTL_RELOAD_FLAG;
 }
 
-void plat_cleanL2Range(paddr_t start, paddr_t end) {}
-void plat_invalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateCache(void) {}
diff --git a/src/plat/allwinnerA20/machine/l2cache.c b/src/plat/allwinnerA20/machine/l2cache.c
index 87525685d..5e3a29486 100755
--- a/src/plat/allwinnerA20/machine/l2cache.c
+++ b/src/plat/allwinnerA20/machine/l2cache.c
@@ -40,3 +40,8 @@ initL2Cache(void)
 
     cleanInvalidateL1Caches();
 }
+
+void plat_cleanL2Range(paddr_t start, paddr_t end) {}
+void plat_invalidateL2Range(paddr_t start, paddr_t end) {}
+void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end) {}
+void plat_cleanInvalidateCache(void) {}
diff --git a/src/plat/am335x/machine/hardware.c b/src/plat/am335x/machine/hardware.c
index 988e878f8..264408eaf 100644
--- a/src/plat/am335x/machine/hardware.c
+++ b/src/plat/am335x/machine/hardware.c
@@ -117,8 +117,3 @@ initIRQController(void)
 }
 
 BOOT_CODE void cpu_initLocalIRQController(void) {}
-
-void plat_cleanL2Range(paddr_t start, paddr_t end) {}
-void plat_invalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateCache(void) {}
diff --git a/src/plat/am335x/machine/l2cache.c b/src/plat/am335x/machine/l2cache.c
index 20c87208b..9537555f7 100644
--- a/src/plat/am335x/machine/l2cache.c
+++ b/src/plat/am335x/machine/l2cache.c
@@ -40,3 +40,8 @@ initL2Cache(void)
 
     cleanInvalidateL1Caches();
 }
+
+void plat_cleanL2Range(paddr_t start, paddr_t end) {}
+void plat_invalidateL2Range(paddr_t start, paddr_t end) {}
+void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end) {}
+void plat_cleanInvalidateCache(void) {}
diff --git a/src/plat/apq8064/config.cmake b/src/plat/apq8064/config.cmake
index 66796a158..b811a90a6 100644
--- a/src/plat/apq8064/config.cmake
+++ b/src/plat/apq8064/config.cmake
@@ -24,9 +24,8 @@ endif()
 add_sources(
     DEP "KernelPlatformAPQ8064"
     CFILES
-        src/plat/apq8064/machine/hardware.c
-        src/plat/apq8064/machine/l2cache.c
         src/plat/apq8064/machine/io.c
         src/plat/apq8064/machine/timer.c
         src/arch/arm/machine/gic_pl390.c
+        src/arch/arm/machine/l2c_nop.c
 )
diff --git a/src/plat/apq8064/machine/hardware.c b/src/plat/apq8064/machine/hardware.c
deleted file mode 100644
index 3eeb2a361..000000000
--- a/src/plat/apq8064/machine/hardware.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright 2014, General Dynamics C4 Systems
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
- */
-/* @AUTHOR(akroh@ertos.nicta.com.au) */
-
-#include <config.h>
-#include <types.h>
-#include <machine/io.h>
-#include <kernel/vspace.h>
-#include <arch/machine.h>
-#include <arch/kernel/vspace.h>
-#include <plat/machine.h>
-#include <linker.h>
-#include <plat/machine/hardware.h>
-
-void plat_cleanL2Range(paddr_t start, paddr_t end) {}
-void plat_invalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateCache(void) {}
diff --git a/src/plat/apq8064/machine/l2cache.c b/src/plat/apq8064/machine/l2cache.c
deleted file mode 100644
index b23c52635..000000000
--- a/src/plat/apq8064/machine/l2cache.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright 2014, General Dynamics C4 Systems
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
- */
-
-
-void initL2Cache(void)
-{
-}
diff --git a/src/plat/bcm2837/config.cmake b/src/plat/bcm2837/config.cmake
index 4f74fd3ae..8a1ebdb89 100644
--- a/src/plat/bcm2837/config.cmake
+++ b/src/plat/bcm2837/config.cmake
@@ -29,6 +29,6 @@ add_sources(
     CFILES
         src/plat/bcm2837/machine/io.c
         src/plat/bcm2837/machine/intc.c
-        src/plat/bcm2837/machine/l2cache.c
         src/arch/arm/machine/generic_timer.c
+        src/arch/arm/machine/l2c_nop.c
 )
diff --git a/src/plat/bcm2837/machine/l2cache.c b/src/plat/bcm2837/machine/l2cache.c
deleted file mode 100644
index 0b30ba437..000000000
--- a/src/plat/bcm2837/machine/l2cache.c
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-void initL2Cache(void)
-{
-}
diff --git a/src/plat/exynos5/config.cmake b/src/plat/exynos5/config.cmake
index 0492121ba..720b644c3 100644
--- a/src/plat/exynos5/config.cmake
+++ b/src/plat/exynos5/config.cmake
@@ -36,7 +36,7 @@ add_sources(
     CFILES
         src/arch/arm/machine/generic_timer.c
         src/plat/exynos5/machine/hardware.c
-        src/plat/exynos5/machine/l2cache.c
         src/plat/exynos_common/io.c
         src/arch/arm/machine/gic_pl390.c
+        src/arch/arm/machine/l2c_nop.c
 )
diff --git a/src/plat/exynos5/machine/hardware.c b/src/plat/exynos5/machine/hardware.c
index b2bd00d99..a9001508f 100644
--- a/src/plat/exynos5/machine/hardware.c
+++ b/src/plat/exynos5/machine/hardware.c
@@ -36,7 +36,3 @@ BOOT_CODE void initTimer(void)
     initGenericTimer();
 }
 
-void plat_cleanL2Range(paddr_t start, paddr_t end) {}
-void plat_invalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end) {}
-
diff --git a/src/plat/exynos5/machine/l2cache.c b/src/plat/exynos5/machine/l2cache.c
deleted file mode 100644
index 39b29ea33..000000000
--- a/src/plat/exynos5/machine/l2cache.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2014, General Dynamics C4 Systems
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
- */
-
-void initL2Cache(void)
-{
-}
-
-void plat_cleanInvalidateCache(void)
-{
-}
diff --git a/src/plat/hikey/config.cmake b/src/plat/hikey/config.cmake
index 291e9ca67..bbcf79fe0 100644
--- a/src/plat/hikey/config.cmake
+++ b/src/plat/hikey/config.cmake
@@ -73,8 +73,8 @@ endif()
 add_sources(
     DEP "KernelPlatformHikey"
     CFILES
-        src/plat/hikey/machine/hardware.c
         src/plat/hikey/machine/io.c
         src/arch/arm/machine/generic_timer.c
         src/arch/arm/machine/gic_pl390.c
+        src/arch/arm/machine/l2c_nop.c
 )
diff --git a/src/plat/hikey/machine/hardware.c b/src/plat/hikey/machine/hardware.c
deleted file mode 100644
index 78aabbabc..000000000
--- a/src/plat/hikey/machine/hardware.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2016, General Dynamics C4 Systems
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
- */
-
-#include <config.h>
-#include <types.h>
-#include <linker.h>
-
-void
-initL2Cache(void)
-{
-
-}
-
-void plat_cleanL2Range(paddr_t start, paddr_t end) {}
-void plat_invalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateCache(void) {}
diff --git a/src/plat/imx7/config.cmake b/src/plat/imx7/config.cmake
index 9c734199d..73ddd16c2 100644
--- a/src/plat/imx7/config.cmake
+++ b/src/plat/imx7/config.cmake
@@ -27,7 +27,7 @@ endif()
 add_sources(
     DEP "KernelPlatImx7"
     CFILES src/plat/imx7/machine/io.c
-           src/plat/imx7/machine/hardware.c
            src/arch/arm/machine/generic_timer.c
            src/arch/arm/machine/gic_pl390.c
+           src/arch/arm/machine/l2c_nop.c
 )
diff --git a/src/plat/imx7/machine/hardware.c b/src/plat/imx7/machine/hardware.c
deleted file mode 100644
index f9d7f4a6a..000000000
--- a/src/plat/imx7/machine/hardware.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright 2014, General Dynamics C4 Systems
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
- */
-
-#include <config.h>
-#include <types.h>
-#include <arch/machine.h>
-
-/* Cortex-A7 uses an integrated L2 cache controller */
-void
-initL2Cache(void)
-{
-}
-
-void plat_cleanL2Range(paddr_t start, paddr_t end) {}
-void plat_invalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateCache(void) {}
diff --git a/src/plat/omap3/machine/hardware.c b/src/plat/omap3/machine/hardware.c
index 8ed84c3ad..18a36899b 100644
--- a/src/plat/omap3/machine/hardware.c
+++ b/src/plat/omap3/machine/hardware.c
@@ -65,8 +65,3 @@ initIRQController(void)
 }
 
 BOOT_CODE void cpu_initLocalIRQController(void) {}
-
-void plat_cleanL2Range(paddr_t start, paddr_t end) {}
-void plat_invalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateCache(void) {}
diff --git a/src/plat/omap3/machine/l2cache.c b/src/plat/omap3/machine/l2cache.c
index 20c87208b..9537555f7 100644
--- a/src/plat/omap3/machine/l2cache.c
+++ b/src/plat/omap3/machine/l2cache.c
@@ -40,3 +40,8 @@ initL2Cache(void)
 
     cleanInvalidateL1Caches();
 }
+
+void plat_cleanL2Range(paddr_t start, paddr_t end) {}
+void plat_invalidateL2Range(paddr_t start, paddr_t end) {}
+void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end) {}
+void plat_cleanInvalidateCache(void) {}
diff --git a/src/plat/tk1/config.cmake b/src/plat/tk1/config.cmake
index f4d95efac..0b4616aef 100644
--- a/src/plat/tk1/config.cmake
+++ b/src/plat/tk1/config.cmake
@@ -25,12 +25,11 @@ endif()
 add_sources(
     DEP "KernelPlatformTK1"
     CFILES
-        src/plat/tk1/machine/hardware.c
         src/plat/tk1/machine/io.c
-        src/plat/tk1/machine/l2cache.c
         src/plat/tk1/machine/smmu.c
         src/arch/arm/machine/generic_timer.c
         src/arch/arm/machine/gic_pl390.c
+        src/arch/arm/machine/l2c_nop.c
 )
 
 add_bf_source_old("KernelPlatformTK1" "hardware.bf" "include/plat/tk1" "plat/machine")
diff --git a/src/plat/tk1/machine/hardware.c b/src/plat/tk1/machine/hardware.c
deleted file mode 100644
index c87b35846..000000000
--- a/src/plat/tk1/machine/hardware.c
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright 2016, General Dynamics C4 Systems
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
- */
-#include <config.h>
-#include <types.h>
-#include <arch/machine.h>
-#include <linker.h>
-
-
-void plat_cleanL2Range(paddr_t start, paddr_t end) {}
-void plat_invalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateCache(void) {}
diff --git a/src/plat/tk1/machine/l2cache.c b/src/plat/tk1/machine/l2cache.c
deleted file mode 100644
index f71b330b6..000000000
--- a/src/plat/tk1/machine/l2cache.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2016, General Dynamics C4 Systems
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_GPL)
- */
-
-#include <arch/machine.h>
-
-void
-initL2Cache(void)
-{
-
-}
-
diff --git a/src/plat/tx1/config.cmake b/src/plat/tx1/config.cmake
index 38d88eac4..578cdf2d6 100644
--- a/src/plat/tx1/config.cmake
+++ b/src/plat/tx1/config.cmake
@@ -26,9 +26,8 @@ endif()
 add_sources(
     DEP "KernelPlatformTx1"
     CFILES
-        src/plat/tx1/machine/hardware.c
         src/plat/tx1/machine/io.c
-        src/plat/tx1/machine/l2cache.c
         src/arch/arm/machine/generic_timer.c
         src/arch/arm/machine/gic_pl390.c
+        src/arch/arm/machine/l2c_nop.c
 )
diff --git a/src/plat/tx1/machine/hardware.c b/src/plat/tx1/machine/hardware.c
deleted file mode 100644
index b5dfa3364..000000000
--- a/src/plat/tx1/machine/hardware.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-#include <config.h>
-#include <types.h>
-#include <arch/machine.h>
-#include <linker.h>
-
-
-void plat_cleanL2Range(paddr_t start, paddr_t end) {}
-void plat_invalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateCache(void) {}
diff --git a/src/plat/tx1/machine/l2cache.c b/src/plat/tx1/machine/l2cache.c
deleted file mode 100644
index 479ed8b1c..000000000
--- a/src/plat/tx1/machine/l2cache.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2017, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-#include <arch/machine.h>
-
-void
-initL2Cache(void)
-{
-
-}
-
diff --git a/src/plat/tx2/config.cmake b/src/plat/tx2/config.cmake
index 6ddb6b8d9..db68fabb2 100644
--- a/src/plat/tx2/config.cmake
+++ b/src/plat/tx2/config.cmake
@@ -29,9 +29,8 @@ endif()
 add_sources(
     DEP "KernelPlatformTx2"
     CFILES
-        src/plat/tx2/machine/hardware.c
         src/plat/tx2/machine/io.c
-        src/plat/tx2/machine/l2cache.c
         src/arch/arm/machine/generic_timer.c
         src/arch/arm/machine/gic_pl390.c
+        src/arch/arm/machine/l2c_nop.c
 )
diff --git a/src/plat/tx2/machine/l2cache.c b/src/plat/tx2/machine/l2cache.c
deleted file mode 100644
index bbd2db5f6..000000000
--- a/src/plat/tx2/machine/l2cache.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright 2018, Data61
- * Commonwealth Scientific and Industrial Research Organisation (CSIRO)
- * ABN 41 687 119 230.
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(DATA61_GPL)
- */
-
-#include <arch/machine.h>
-
-void
-initL2Cache(void)
-{
-
-}
-
diff --git a/src/plat/zynqmp/config.cmake b/src/plat/zynqmp/config.cmake
index 7f5526a69..d86b77071 100644
--- a/src/plat/zynqmp/config.cmake
+++ b/src/plat/zynqmp/config.cmake
@@ -40,4 +40,5 @@ add_sources(
         src/plat/zynqmp/machine/io.c
         src/arch/arm/machine/generic_timer.c
         src/arch/arm/machine/gic_pl390.c
+        src/arch/arm/machine/l2c_nop.c
 )
diff --git a/src/plat/zynqmp/machine/hardware.c b/src/plat/zynqmp/machine/hardware.c
deleted file mode 100644
index 0e25d18e5..000000000
--- a/src/plat/zynqmp/machine/hardware.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2017, DornerWorks
- * Copyright 2016, General Dynamics C4 Systems
- *
- * This software may be distributed and modified according to the terms of
- * the GNU General Public License version 2. Note that NO WARRANTY is provided.
- * See "LICENSE_GPLv2.txt" for details.
- *
- * @TAG(GD_DORNERWORKS_GPL)
- */
-/*
- * This data was produced by DornerWorks, Ltd. of Grand Rapids, MI, USA under
- * a DARPA SBIR, Contract Number D16PC00107.
- *
- * Approved for Public Release, Distribution Unlimited.
- */
-
-#include <config.h>
-#include <types.h>
-#include <arch/machine.h>
-#include <arch/linker.h>
-
-void
-initL2Cache(void)
-{
-
-}
-
-void plat_cleanL2Range(paddr_t start, paddr_t end) {}
-void plat_invalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateL2Range(paddr_t start, paddr_t end) {}
-void plat_cleanInvalidateCache(void) {}
-- 
GitLab