diff options
author | Andre Przywara <andre.przywara@arm.com> | 2016-04-14 00:57:29 +0100 |
---|---|---|
committer | Andre Przywara <andre.przywara@arm.com> | 2016-06-02 01:26:04 +0100 |
commit | 2148dcb390b5c20112ef16478902ea0a51b85fcd (patch) | |
tree | b5fa1ed5565de0299bbaf9a039a37ed454d25fb6 | |
parent | 0ef98df67f826c634e6e9e3ffe6b6a10a729bc84 (diff) |
sun50i: remove unneeded TSP implementation
The TSP is just for testing a secure payload, which we don't need,
so just remove the code.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
-rw-r--r-- | plat/sun50iw1p1/include/platform_def.h | 16 | ||||
-rw-r--r-- | plat/sun50iw1p1/tsp/tsp-wine.mk | 38 | ||||
-rw-r--r-- | plat/sun50iw1p1/tsp/tsp_sunxi_setup.c | 101 |
3 files changed, 0 insertions, 155 deletions
diff --git a/plat/sun50iw1p1/include/platform_def.h b/plat/sun50iw1p1/include/platform_def.h index 555f80b..45b79e7 100644 --- a/plat/sun50iw1p1/include/platform_def.h +++ b/plat/sun50iw1p1/include/platform_def.h @@ -83,22 +83,6 @@ #define BL31_LIMIT SUNXI_TRUSTED_MONITOR_LIMIT /******************************************************************************* - * BL32 specific defines. - ******************************************************************************/ -/* - * On sun50iw1p1, the TSP can execute either from Trusted SRAM or Trusted DRAM. - */ - -#define TSP_SEC_MEM_BASE SUNXI_TRUSTED_DRAM_BASE -#define TSP_SEC_MEM_SIZE SUNXI_TRUSTED_DRAM_SIZE - - -/* - * ID of the secure physical generic timer interrupt used by the TSP. - */ -#define TSP_IRQ_SEC_PHY_TIMER IRQ_SEC_PHY_TIMER - -/******************************************************************************* * Platform specific page table and MMU setup constants ******************************************************************************/ #define ADDR_SPACE_SIZE (1ull << 32) diff --git a/plat/sun50iw1p1/tsp/tsp-wine.mk b/plat/sun50iw1p1/tsp/tsp-wine.mk deleted file mode 100644 index 3cbc6ec..0000000 --- a/plat/sun50iw1p1/tsp/tsp-wine.mk +++ /dev/null @@ -1,38 +0,0 @@ -# -# Copyright (c) 2013-2014, ARM Limited and Contributors. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# Redistributions of source code must retain the above copyright notice, this -# list of conditions and the following disclaimer. -# -# Redistributions in binary form must reproduce the above copyright notice, -# this list of conditions and the following disclaimer in the documentation -# and/or other materials provided with the distribution. -# -# Neither the name of ARM nor the names of its contributors may be used -# to endorse or promote products derived from this software without specific -# prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# - -# TSP source files specific to FVP platform -BL32_SOURCES += drivers/arm/gic/arm_gic.c \ - drivers/arm/gic/gic_v2.c \ - plat/common/aarch64/platform_mp_stack.S \ - plat/common/plat_gic.c \ - plat/sun50iw1p1/aarch64/sunxi_common.c \ - plat/sun50iw1p1/aarch64/sunxi_helpers.S \ - plat/sun50iw1p1/tsp/tsp_sunxi_setup.c diff --git a/plat/sun50iw1p1/tsp/tsp_sunxi_setup.c b/plat/sun50iw1p1/tsp/tsp_sunxi_setup.c deleted file mode 100644 index a251b79..0000000 --- a/plat/sun50iw1p1/tsp/tsp_sunxi_setup.c +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (c) 2013-2014, ARM Limited and Contributors. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * Neither the name of ARM nor the names of its contributors may be used - * to endorse or promote products derived from this software without specific - * prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - */ - -#include <bl_common.h> -#include <console.h> -#include <platform_tsp.h> -#include "../sunxi_def.h" -#include "../sunxi_private.h" - -/******************************************************************************* - * Declarations of linker defined symbols which will help us find the layout - * of trusted SRAM - ******************************************************************************/ -extern unsigned long __RO_START__; -extern unsigned long __RO_END__; - -extern unsigned long __COHERENT_RAM_START__; -extern unsigned long __COHERENT_RAM_END__; - -/* - * The next 2 constants identify the extents of the code & RO data region. - * These addresses are used by the MMU setup code and therefore they must be - * page-aligned. It is the responsibility of the linker script to ensure that - * __RO_START__ and __RO_END__ linker symbols refer to page-aligned addresses. - */ -#define BL32_RO_BASE (unsigned long)(&__RO_START__) -#define BL32_RO_LIMIT (unsigned long)(&__RO_END__) - -/* - * The next 2 constants identify the extents of the coherent memory region. - * These addresses are used by the MMU setup code and therefore they must be - * page-aligned. It is the responsibility of the linker script to ensure that - * __COHERENT_RAM_START__ and __COHERENT_RAM_END__ linker symbols refer to - * page-aligned addresses. - */ -#define BL32_COHERENT_RAM_BASE (unsigned long)(&__COHERENT_RAM_START__) -#define BL32_COHERENT_RAM_LIMIT (unsigned long)(&__COHERENT_RAM_END__) - -/******************************************************************************* - * Initialize the UART - ******************************************************************************/ -void tsp_early_platform_setup(void) -{ - /* - * Initialize a different console than already in use to display - * messages from TSP - */ - console_init(SUNXI_UART0_BASE, UART0_CLK_IN_HZ, UART0_BAUDRATE); - - /* Initialize the platform config for future decision making */ - sunxi_config_setup(); -} - -/******************************************************************************* - * Perform platform specific setup placeholder - ******************************************************************************/ -void tsp_platform_setup(void) -{ - gic_setup(); -} - -/******************************************************************************* - * Perform the very early platform specific architectural setup here. At the - * moment this is only intializes the MMU - ******************************************************************************/ -void tsp_plat_arch_setup(void) -{ - sunxi_configure_mmu_el1(BL32_RO_BASE, - (BL32_COHERENT_RAM_LIMIT - BL32_RO_BASE), - BL32_RO_BASE, - BL32_RO_LIMIT, - BL32_COHERENT_RAM_BASE, - BL32_COHERENT_RAM_LIMIT); -} |