rpi3: Move shared rpi3 files into common directory
To be able to share code more easily between the existing Raspberry Pi 3 and the upcoming Raspberry Pi 4 platform, move some code which is not board specific into a "common" directory. Change-Id: I9211ab2d754b040128fac13c2f0a30a5cc8c7f2c Signed-off-by: Andre Przywara <andre.przywara@arm.com>
This commit is contained in:
Andre Przywara
parent
3ef45dda88
commit
4f2b984852
|
|
@ -4,8 +4,8 @@
|
|||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
||||
#ifndef RPI3_PRIVATE_H
|
||||
#define RPI3_PRIVATE_H
|
||||
#ifndef RPI_SHARED_H
|
||||
#define RPI_SHARED_H
|
||||
|
||||
#include <stdint.h>
|
||||
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
#include <lib/xlat_tables/xlat_tables_v2.h>
|
||||
|
||||
#include <rpi_hw.h>
|
||||
#include "rpi3_private.h"
|
||||
#include <rpi_shared.h>
|
||||
|
||||
#define MAP_DEVICE0 MAP_REGION_FLAT(DEVICE0_BASE, \
|
||||
DEVICE0_SIZE, \
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
#include <lib/utils.h>
|
||||
#include <lib/utils_def.h>
|
||||
|
||||
#include "rpi3_private.h"
|
||||
#include <drivers/rpi3/rng/rpi3_rng.h>
|
||||
|
||||
/* Get 128 bits of entropy and fuse the values together to form the canary. */
|
||||
#define TRNG_NBYTES 16U
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
#include <arch.h>
|
||||
|
||||
#include "rpi3_private.h"
|
||||
#include <rpi_shared.h>
|
||||
|
||||
/* The power domain tree descriptor */
|
||||
static unsigned char power_domain_tree_desc[] = {
|
||||
|
|
@ -7,10 +7,11 @@
|
|||
include lib/libfdt/libfdt.mk
|
||||
include lib/xlat_tables_v2/xlat_tables.mk
|
||||
|
||||
PLAT_INCLUDES := -Iplat/rpi/rpi3/include
|
||||
PLAT_INCLUDES := -Iplat/rpi/common/include \
|
||||
-Iplat/rpi/rpi3/include
|
||||
|
||||
PLAT_BL_COMMON_SOURCES := drivers/ti/uart/aarch64/16550_console.S \
|
||||
plat/rpi/rpi3/rpi3_common.c \
|
||||
plat/rpi/common/rpi3_common.c \
|
||||
${XLAT_TABLES_LIB_SRCS}
|
||||
|
||||
BL1_SOURCES += drivers/io/io_fip.c \
|
||||
|
|
@ -20,7 +21,7 @@ BL1_SOURCES += drivers/io/io_fip.c \
|
|||
plat/common/aarch64/platform_mp_stack.S \
|
||||
plat/rpi/rpi3/aarch64/plat_helpers.S \
|
||||
plat/rpi/rpi3/rpi3_bl1_setup.c \
|
||||
plat/rpi/rpi3/rpi3_io_storage.c \
|
||||
plat/rpi/common/rpi3_io_storage.c \
|
||||
drivers/rpi3/mailbox/rpi3_mbox.c \
|
||||
plat/rpi/rpi3/rpi_mbox_board.c
|
||||
|
||||
|
|
@ -39,15 +40,15 @@ BL2_SOURCES += common/desc_image_load.c \
|
|||
plat/rpi/rpi3/aarch64/plat_helpers.S \
|
||||
plat/rpi/rpi3/aarch64/rpi3_bl2_mem_params_desc.c \
|
||||
plat/rpi/rpi3/rpi3_bl2_setup.c \
|
||||
plat/rpi/rpi3/rpi3_image_load.c \
|
||||
plat/rpi/rpi3/rpi3_io_storage.c
|
||||
plat/rpi/common/rpi3_image_load.c \
|
||||
plat/rpi/common/rpi3_io_storage.c
|
||||
|
||||
BL31_SOURCES += lib/cpus/aarch64/cortex_a53.S \
|
||||
plat/common/plat_psci_common.c \
|
||||
plat/rpi/rpi3/aarch64/plat_helpers.S \
|
||||
plat/rpi/rpi3/rpi3_bl31_setup.c \
|
||||
plat/rpi/rpi3/rpi3_pm.c \
|
||||
plat/rpi/rpi3/rpi3_topology.c \
|
||||
plat/rpi/common/rpi3_pm.c \
|
||||
plat/rpi/common/rpi3_topology.c \
|
||||
${LIBFDT_SRCS}
|
||||
|
||||
# Tune compiler for Cortex-A53
|
||||
|
|
@ -160,7 +161,7 @@ endif
|
|||
|
||||
ifneq ($(ENABLE_STACK_PROTECTOR), 0)
|
||||
PLAT_BL_COMMON_SOURCES += drivers/rpi3/rng/rpi3_rng.c \
|
||||
plat/rpi/rpi3/rpi3_stack_protector.c
|
||||
plat/rpi/common/rpi3_stack_protector.c
|
||||
endif
|
||||
|
||||
ifeq (${SPD},opteed)
|
||||
|
|
@ -190,13 +191,13 @@ ifneq (${TRUSTED_BOARD_BOOT},0)
|
|||
BL1_SOURCES += ${AUTH_SOURCES} \
|
||||
bl1/tbbr/tbbr_img_desc.c \
|
||||
plat/common/tbbr/plat_tbbr.c \
|
||||
plat/rpi/rpi3/rpi3_trusted_boot.c \
|
||||
plat/rpi/rpi3/rpi3_rotpk.S
|
||||
plat/rpi/common/rpi3_trusted_boot.c \
|
||||
plat/rpi/common/rpi3_rotpk.S
|
||||
|
||||
BL2_SOURCES += ${AUTH_SOURCES} \
|
||||
plat/common/tbbr/plat_tbbr.c \
|
||||
plat/rpi/rpi3/rpi3_trusted_boot.c \
|
||||
plat/rpi/rpi3/rpi3_rotpk.S
|
||||
plat/rpi/common/rpi3_trusted_boot.c \
|
||||
plat/rpi/common/rpi3_rotpk.S
|
||||
|
||||
ROT_KEY = $(BUILD_PLAT)/rot_key.pem
|
||||
ROTPK_HASH = $(BUILD_PLAT)/rotpk_sha256.bin
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
#include <lib/xlat_tables/xlat_mmu_helpers.h>
|
||||
#include <lib/xlat_tables/xlat_tables_defs.h>
|
||||
|
||||
#include "rpi3_private.h"
|
||||
#include <rpi_shared.h>
|
||||
|
||||
/* Data structure which holds the extents of the trusted SRAM for BL1 */
|
||||
static meminfo_t bl1_tzram_layout;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
#include <drivers/rpi3/gpio/rpi3_gpio.h>
|
||||
#include <drivers/rpi3/sdhost/rpi3_sdhost.h>
|
||||
|
||||
#include "rpi3_private.h"
|
||||
#include <rpi_shared.h>
|
||||
|
||||
/* Data structure which holds the extents of the trusted SRAM for BL2 */
|
||||
static meminfo_t bl2_tzram_layout __aligned(CACHE_WRITEBACK_GRANULE);
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved.
|
||||
* Copyright (c) 2015-2019, ARM Limited and Contributors. All rights reserved.
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-3-Clause
|
||||
*/
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
#include <lib/xlat_tables/xlat_tables_defs.h>
|
||||
#include <plat/common/platform.h>
|
||||
|
||||
#include "rpi3_private.h"
|
||||
#include <rpi_shared.h>
|
||||
|
||||
/*
|
||||
* Placeholder variables for copying the arguments that have been passed to
|
||||
|
|
|
|||
Loading…
Reference in New Issue