diff --git a/include/plat/bcm2837/plat/machine/hardware.h b/include/plat/bcm2837/plat/machine/hardware.h index b90a585a01c20916e37d5416d705270649906995..27452a0d6c8526afa12923e5f785ff010d9f64b8 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 7deaca03f3047ade72505a65c9ec569c6fa9f513..1277c927db2c88605c455737408b38d2b823ae2c 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 d420d6d48d826e62b1defb33a42b5a8eb3c27801..24f6148169e7ec03fba80d9c75cb4c52d89758cd 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 87525685d80b9bd17c32e167f1ed408bc7369856..5e3a29486b06f5c1b803611879d6ead97a888008 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 988e878f8ddf68664198e75724bc547066a54b15..264408eafcc1ffb4e1603e1bda3096d2a217e10c 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 20c87208bd7e3e4df6250311f7454076011d8c6f..9537555f7811189b0e369d39fad2736e124dc773 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 66796a1589ec9c3b78046cfbe2cdc325c38acc56..b811a90a6099236a04066c65332cf8f4ba7b6974 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 3eeb2a361aeca07e2741eeb06156ead423436e8d..0000000000000000000000000000000000000000 --- 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 b23c52635432a8372b84454f9869888affae855e..0000000000000000000000000000000000000000 --- 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 4f74fd3aea2814d53d1729e8bcdc7f61eb2b2b6f..8a1ebdb89ea974505f6d638071a6c521dadbdfa4 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 0b30ba4376878afa15fcdf8207a8858042b6d6f7..0000000000000000000000000000000000000000 --- 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 0492121bad3f94c91524e87d75f850d7c1d0170d..720b644c3a7611813b11989e2ec303e5f5e3d737 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 b2bd00d9984d865b602372fdde86342763096a28..a9001508f561ca03be93c8724c08fd381a842f0c 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 39b29ea334ff2eabe993ed6344bbdcbe2e32d8f0..0000000000000000000000000000000000000000 --- 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 291e9ca6732050c0a7242834a95ac5313277d8db..bbcf79fe0e609954ba86c8f6b97324d38f73a036 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 78aabbabc5879e905010923904c31d994db992cf..0000000000000000000000000000000000000000 --- 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 9c734199d205da81e9161b32ccfbf5d6a2e5bbc0..73ddd16c213e1e4a967f2f620659461e04d7796b 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 f9d7f4a6aafbf90c683887886ea25b60c88fab24..0000000000000000000000000000000000000000 --- 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 8ed84c3ad0acd3bdad68da0effdcd00f6d73fe33..18a36899b33042b6233f25de5f6cc83e40b71b2f 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 20c87208bd7e3e4df6250311f7454076011d8c6f..9537555f7811189b0e369d39fad2736e124dc773 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 f4d95efac232818d69301c4874e4cfb79ee622ea..0b4616aef68e80acc2f31ae2f741bcc2a9ee208d 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 c87b358469e27b91d829a519a1064842f7a7ad31..0000000000000000000000000000000000000000 --- 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 f71b330b68e207a2f17bdb06770591e89ceb0258..0000000000000000000000000000000000000000 --- 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 38d88eac4ce7b7a39b85370606d959fad3e5dda0..578cdf2d611e17a72a75687e1196bc327102bae2 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 b5dfa336482f7682d31bc583270278d6805d45cc..0000000000000000000000000000000000000000 --- 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 479ed8b1c623478fc679df49e83f05b542affe10..0000000000000000000000000000000000000000 --- 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 6ddb6b8d98fc53d6c12c42519dede07c6f877ead..db68fabb2dfd94868167ea464d3f38f80be83d76 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 bbd2db5f6a07dda33f231a5a4ead0ca48f1b8f05..0000000000000000000000000000000000000000 --- 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 7f5526a69db7cb564a95d145c49267376ae6b35d..d86b77071814572f7c6366202276f706f3886054 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 0e25d18e5a92d9e2a05d48f94a4fcee6e95b3cc3..0000000000000000000000000000000000000000 --- 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) {}