mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-18 02:24:18 +00:00

utils.h is included in various header files for the defines in it. Some of the other header files only contain defines. This allows the header files to be shared between host and target builds for shared defines. Recently types.h has been included in utils.h as well as some function prototypes. Because of the inclusion of types.h conflicts exist building host tools abd these header files now. To solve this problem, move the defines to utils_def.h and have this included by utils.h and change header files to only include utils_def.h and not pick up the new types.h being introduced. Fixes ARM-software/tf-issues#461 Signed-off-by: Scott Branden <scott.branden@broadcom.com> Remove utils_def.h from utils.h This patch removes utils_def.h from utils.h as it is not required. And also makes a minor change to ensure Juno platform compiles. Change-Id: I10cf1fb51e44a8fa6dcec02980354eb9ecc9fa29
89 lines
3.1 KiB
C
89 lines
3.1 KiB
C
/*
|
|
* Copyright (c) 2015-2017, 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.
|
|
*/
|
|
|
|
#ifndef __BOARD_CSS_DEF_H__
|
|
#define __BOARD_CSS_DEF_H__
|
|
|
|
#include <common_def.h>
|
|
#include <soc_css_def.h>
|
|
#include <utils_def.h>
|
|
#include <v2m_def.h>
|
|
|
|
/*
|
|
* Definitions common to all ARM CSS-based development platforms
|
|
*/
|
|
|
|
/* Platform ID address */
|
|
#define BOARD_CSS_PLAT_ID_REG_ADDR 0x7ffe00e0
|
|
|
|
/* Platform ID related accessors */
|
|
#define BOARD_CSS_PLAT_ID_REG_ID_MASK 0x0f
|
|
#define BOARD_CSS_PLAT_ID_REG_ID_SHIFT 0x0
|
|
#define BOARD_CSS_PLAT_ID_REG_VERSION_MASK 0xf00
|
|
#define BOARD_CSS_PLAT_ID_REG_VERSION_SHIFT 0x8
|
|
#define BOARD_CSS_PLAT_TYPE_RTL 0x00
|
|
#define BOARD_CSS_PLAT_TYPE_FPGA 0x01
|
|
#define BOARD_CSS_PLAT_TYPE_EMULATOR 0x02
|
|
#define BOARD_CSS_PLAT_TYPE_FVP 0x03
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
#include <mmio.h>
|
|
|
|
#define BOARD_CSS_GET_PLAT_TYPE(addr) \
|
|
((mmio_read_32(addr) & BOARD_CSS_PLAT_ID_REG_ID_MASK) \
|
|
>> BOARD_CSS_PLAT_ID_REG_ID_SHIFT)
|
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|
|
|
/*
|
|
* Required platform porting definitions common to all ARM CSS-based
|
|
* development platforms
|
|
*/
|
|
|
|
#define PLAT_ARM_DRAM2_SIZE ULL(0x180000000)
|
|
|
|
/* UART related constants */
|
|
#define PLAT_ARM_BOOT_UART_BASE SOC_CSS_UART0_BASE
|
|
#define PLAT_ARM_BOOT_UART_CLK_IN_HZ SOC_CSS_UART0_CLK_IN_HZ
|
|
|
|
#define PLAT_ARM_BL31_RUN_UART_BASE SOC_CSS_UART1_BASE
|
|
#define PLAT_ARM_BL31_RUN_UART_CLK_IN_HZ SOC_CSS_UART1_CLK_IN_HZ
|
|
|
|
#define PLAT_ARM_CRASH_UART_BASE PLAT_ARM_BL31_RUN_UART_BASE
|
|
#define PLAT_ARM_CRASH_UART_CLK_IN_HZ PLAT_ARM_BL31_RUN_UART_CLK_IN_HZ
|
|
|
|
#define PLAT_ARM_TSP_UART_BASE V2M_IOFPGA_UART0_BASE
|
|
#define PLAT_ARM_TSP_UART_CLK_IN_HZ V2M_IOFPGA_UART0_CLK_IN_HZ
|
|
|
|
|
|
#endif /* __BOARD_CSS_DEF_H__ */
|
|
|