Merge pull request #1619 from antonio-nino-diaz-arm/an/norflash
plat/arm: Move norflash driver to drivers/ folder
This commit is contained in:
commit
8b3345f4a6
|
@ -6,8 +6,15 @@
|
|||
|
||||
#include <errno.h>
|
||||
#include <mmio.h>
|
||||
#include <norflash.h>
|
||||
#include <v2m_flash.h>
|
||||
|
||||
/*
|
||||
* This file supplies a low level interface to the vexpress NOR flash
|
||||
* memory of juno and fvp. This memory is organized as an interleaved
|
||||
* memory of two chips with a 16 bit word. It means that every 32 bit
|
||||
* access is going to access to two different chips. This is very
|
||||
* important when we send commands or read status of the chips.
|
||||
*/
|
||||
|
||||
/*
|
||||
* DWS ready poll retries. The number of retries in this driver have been
|
||||
|
@ -21,14 +28,6 @@
|
|||
/* Helper macro to detect end of command */
|
||||
#define NOR_CMD_END (NOR_DWS | NOR_DWS << 16l)
|
||||
|
||||
/*
|
||||
* This file supplies a low level interface to the vexpress NOR flash
|
||||
* memory of juno and fvp. This memory is organized as an interleaved
|
||||
* memory of two chips with a 16 bit word. It means that every 32 bit
|
||||
* access is going to access to two different chips. This is very
|
||||
* important when we send commands or read status of the chips
|
||||
*/
|
||||
|
||||
/* Helper macros to access two flash banks in parallel */
|
||||
#define NOR_2X16(d) ((d << 16) | (d & 0xffff))
|
||||
|
|
@ -4,15 +4,15 @@
|
|||
# SPDX-License-Identifier: BSD-3-Clause
|
||||
#
|
||||
|
||||
PLAT_INCLUDES += -Iinclude/plat/arm/board/common/ \
|
||||
-Iinclude/plat/arm/board/common/drivers
|
||||
PLAT_INCLUDES += -Iinclude/drivers/cfi/ \
|
||||
-Iinclude/plat/arm/board/common/
|
||||
|
||||
PLAT_BL_COMMON_SOURCES += drivers/arm/pl011/${ARCH}/pl011_console.S \
|
||||
PLAT_BL_COMMON_SOURCES += drivers/arm/pl011/${ARCH}/pl011_console.S \
|
||||
plat/arm/board/common/${ARCH}/board_arm_helpers.S
|
||||
|
||||
BL1_SOURCES += plat/arm/board/common/drivers/norflash/norflash.c
|
||||
BL1_SOURCES += drivers/cfi/v2m/v2m_flash.c
|
||||
|
||||
BL2_SOURCES += plat/arm/board/common/drivers/norflash/norflash.c
|
||||
BL2_SOURCES += drivers/cfi/v2m/v2m_flash.c
|
||||
|
||||
ifneq (${TRUSTED_BOARD_BOOT},0)
|
||||
ifneq (${ARM_CRYPTOCELL_INTEG}, 1)
|
||||
|
|
|
@ -147,13 +147,13 @@ BL2U_SOURCES += plat/arm/board/fvp/fvp_bl2u_setup.c \
|
|||
${FVP_SECURITY_SOURCES}
|
||||
|
||||
BL31_SOURCES += drivers/arm/smmu/smmu_v3.c \
|
||||
drivers/cfi/v2m/v2m_flash.c \
|
||||
lib/utils/mem_region.c \
|
||||
plat/arm/board/fvp/fvp_bl31_setup.c \
|
||||
plat/arm/board/fvp/fvp_pm.c \
|
||||
plat/arm/board/fvp/fvp_topology.c \
|
||||
plat/arm/board/fvp/aarch64/fvp_helpers.S \
|
||||
plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.c \
|
||||
plat/arm/board/common/drivers/norflash/norflash.c \
|
||||
plat/arm/common/arm_nor_psci_mem_protect.c \
|
||||
${FVP_CPU_LIBS} \
|
||||
${FVP_GIC_SOURCES} \
|
||||
|
|
|
@ -1,17 +1,17 @@
|
|||
#
|
||||
# Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
|
||||
# Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved.
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-3-Clause
|
||||
#
|
||||
|
||||
# SP_MIN source files specific to FVP platform
|
||||
BL32_SOURCES += lib/utils/mem_region.c \
|
||||
BL32_SOURCES += drivers/cfi/v2m/v2m_flash.c \
|
||||
lib/utils/mem_region.c \
|
||||
plat/arm/board/fvp/aarch32/fvp_helpers.S \
|
||||
plat/arm/board/fvp/drivers/pwrc/fvp_pwrc.c \
|
||||
plat/arm/board/fvp/fvp_pm.c \
|
||||
plat/arm/board/fvp/fvp_topology.c \
|
||||
plat/arm/board/fvp/sp_min/fvp_sp_min_setup.c \
|
||||
plat/arm/board/common/drivers/norflash/norflash.c \
|
||||
plat/arm/common/arm_nor_psci_mem_protect.c \
|
||||
${FVP_CPU_LIBS} \
|
||||
${FVP_GIC_SOURCES} \
|
||||
|
|
|
@ -73,12 +73,12 @@ BL2_SOURCES += lib/utils/mem_region.c \
|
|||
|
||||
BL2U_SOURCES += ${JUNO_SECURITY_SOURCES}
|
||||
|
||||
BL31_SOURCES += lib/cpus/aarch64/cortex_a53.S \
|
||||
BL31_SOURCES += drivers/cfi/v2m/v2m_flash.c \
|
||||
lib/cpus/aarch64/cortex_a53.S \
|
||||
lib/cpus/aarch64/cortex_a57.S \
|
||||
lib/cpus/aarch64/cortex_a72.S \
|
||||
lib/utils/mem_region.c \
|
||||
plat/arm/board/juno/juno_topology.c \
|
||||
plat/arm/board/common/drivers/norflash/norflash.c \
|
||||
plat/arm/common/arm_nor_psci_mem_protect.c \
|
||||
${JUNO_GIC_SOURCES} \
|
||||
${JUNO_INTERCONNECT_SOURCES} \
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
#
|
||||
# Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
|
||||
# Copyright (c) 2016-2018, ARM Limited and Contributors. All rights reserved.
|
||||
#
|
||||
# SPDX-License-Identifier: BSD-3-Clause
|
||||
#
|
||||
|
||||
# SP_MIN source files specific to JUNO platform
|
||||
BL32_SOURCES += lib/cpus/aarch32/cortex_a53.S \
|
||||
BL32_SOURCES += drivers/cfi/v2m/v2m_flash.c \
|
||||
lib/cpus/aarch32/cortex_a53.S \
|
||||
lib/cpus/aarch32/cortex_a57.S \
|
||||
lib/cpus/aarch32/cortex_a72.S \
|
||||
lib/utils/mem_region.c \
|
||||
plat/arm/board/common/drivers/norflash/norflash.c \
|
||||
plat/arm/board/juno/juno_topology.c \
|
||||
plat/arm/common/arm_nor_psci_mem_protect.c \
|
||||
plat/arm/soc/common/soc_css_security.c \
|
||||
|
|
|
@ -9,6 +9,6 @@ include plat/arm/css/sgi/sgi-common.mk
|
|||
BL2_SOURCES += lib/utils/mem_region.c \
|
||||
plat/arm/common/arm_nor_psci_mem_protect.c
|
||||
|
||||
BL31_SOURCES += lib/utils/mem_region.c \
|
||||
plat/arm/board/common/drivers/norflash/norflash.c \
|
||||
BL31_SOURCES += drivers/cfi/v2m/v2m_flash.c \
|
||||
lib/utils/mem_region.c \
|
||||
plat/arm/common/arm_nor_psci_mem_protect.c
|
||||
|
|
|
@ -15,6 +15,6 @@ PLAT_INCLUDES +=-I${SGM775_BASE}/include/
|
|||
BL2_SOURCES += lib/utils/mem_region.c \
|
||||
plat/arm/common/arm_nor_psci_mem_protect.c
|
||||
|
||||
BL31_SOURCES += lib/utils/mem_region.c \
|
||||
plat/arm/board/common/drivers/norflash/norflash.c \
|
||||
BL31_SOURCES += drivers/cfi/v2m/v2m_flash.c \
|
||||
lib/utils/mem_region.c \
|
||||
plat/arm/common/arm_nor_psci_mem_protect.c
|
||||
|
|
|
@ -8,10 +8,10 @@
|
|||
#include <console.h>
|
||||
#include <debug.h>
|
||||
#include <errno.h>
|
||||
#include <norflash.h>
|
||||
#include <platform.h>
|
||||
#include <platform_def.h>
|
||||
#include <stdint.h>
|
||||
#include <v2m_flash.h>
|
||||
|
||||
#pragma weak plat_arm_error_handler
|
||||
|
||||
|
|
|
@ -6,12 +6,11 @@
|
|||
|
||||
#include <debug.h>
|
||||
#include <mmio.h>
|
||||
#include <norflash.h>
|
||||
#include <plat_arm.h>
|
||||
#include <platform_def.h>
|
||||
#include <psci.h>
|
||||
#include <utils.h>
|
||||
|
||||
#include <v2m_flash.h>
|
||||
|
||||
/*
|
||||
* DRAM1 is used also to load the NS boot loader. For this reason we
|
||||
|
|
Loading…
Reference in New Issue